|
@@ -68,12 +68,10 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
|
|
|
public OmstruckOrder generateOmsTruckOrder(Map<String, Object> map){
|
|
|
OmstruckOrder omstruckOrder = new OmstruckOrder();
|
|
|
//生成订单主键Id
|
|
|
- long id;
|
|
|
BigDecimal maxId = omstruckOrderMapper.selectMaxId();
|
|
|
- id = maxId == null ? 1 : maxId.longValue() + 1;
|
|
|
- BigDecimal orderId = new BigDecimal(id);
|
|
|
- omstruckOrder.setOrderId(orderId);
|
|
|
+ omstruckOrder.setOrderId(maxId);
|
|
|
//生成运输订单号
|
|
|
+ int id = maxId.intValue();
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
|
|
|
String orderNumber = "WYSDD" + sdf.format(new Date());
|
|
|
orderNumber +=
|
|
@@ -135,10 +133,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
|
|
|
*/
|
|
|
public int addTotalResult(BigDecimal orderId){
|
|
|
TmstruckTotalResult tmstruckTotalResult = new TmstruckTotalResult();
|
|
|
- BigDecimal selectMaxId = tmstruckTotalResultMapper.selectMaxId();
|
|
|
- long totalId;
|
|
|
- totalId = selectMaxId == null ? 1 : selectMaxId.longValue() + 1;
|
|
|
- tmstruckTotalResult.setResultTotalId(new BigDecimal(totalId));
|
|
|
+ tmstruckTotalResult.setResultTotalId(tmstruckTotalResultMapper.selectMaxId());
|
|
|
tmstruckTotalResult.setOrderId(orderId);
|
|
|
tmstruckTotalResult.setInsertTime(new Date());
|
|
|
tmstruckTotalResult.setInsertUsername("admin");
|
|
@@ -154,10 +149,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
|
|
|
//新增运输订单子表
|
|
|
OmstruckOrderMaterial omstruckOrderMaterial = new OmstruckOrderMaterial();
|
|
|
//生成子表主键
|
|
|
- long childId;
|
|
|
- BigDecimal selectMaxId = omstruckOrderMaterialMapper.selectMaxId();
|
|
|
- childId = selectMaxId == null ? 1 : selectMaxId.longValue() + 1;
|
|
|
- omstruckOrderMaterial.setOrderMaterialId(new BigDecimal(childId));
|
|
|
+ omstruckOrderMaterial.setOrderMaterialId(omstruckOrderMaterialMapper.selectMaxId());
|
|
|
omstruckOrderMaterial.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
|
|
|
omstruckOrderMaterial.setOrderId(orderId);
|
|
|
Object orderMaterialWeight = map.get("orderMaterialWeight"); // 采购辅料没有物资重量
|