|
@@ -301,6 +301,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
|
|
omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
|
|
omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
|
|
break;
|
|
break;
|
|
case 2:
|
|
case 2:
|
|
|
|
+ case 3:
|
|
//获取发运计划id
|
|
//获取发运计划id
|
|
//生成子表主键
|
|
//生成子表主键
|
|
omstruckOrderMaterial.setOrderMaterialId(omstruckOrderMaterialMapper.selectMaxId());
|
|
omstruckOrderMaterial.setOrderMaterialId(omstruckOrderMaterialMapper.selectMaxId());
|
|
@@ -317,23 +318,6 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
|
|
omstruckOrderMaterial.setOrderMaterialWeight(DataChange.dataToBigDecimal(materialWeight));
|
|
omstruckOrderMaterial.setOrderMaterialWeight(DataChange.dataToBigDecimal(materialWeight));
|
|
omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
|
|
omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
|
|
break;
|
|
break;
|
|
- case 3:
|
|
|
|
- //获取发运计划id
|
|
|
|
- //生成子表主键
|
|
|
|
- omstruckOrderMaterial.setOrderMaterialId(omstruckOrderMaterialMapper.selectMaxId());
|
|
|
|
- Integer dayPlanId1 = (Integer) map.get("dayPlanId");
|
|
|
|
- //设置订单id
|
|
|
|
- omstruckOrderMaterial.setOrderId(orderId);
|
|
|
|
- //根据发运计划id查找物资id和物资重量
|
|
|
|
- map = omstruckOrderMapper.selectMaterialIdAndWeightByDayPlanId(dayPlanId1);
|
|
|
|
- BigDecimal materialId1 = (BigDecimal) map.get("materialId");
|
|
|
|
- BigDecimal materialWeight1 = (BigDecimal) map.get("materialWeight");
|
|
|
|
- //设置物资id
|
|
|
|
- omstruckOrderMaterial.setMaterialId(DataChange.dataToBigDecimal(materialId1));
|
|
|
|
- //设置物资重量
|
|
|
|
- omstruckOrderMaterial.setOrderMaterialWeight(DataChange.dataToBigDecimal(materialWeight1));
|
|
|
|
- omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
|
|
|
|
- break;
|
|
|
|
case 4:
|
|
case 4:
|
|
break;
|
|
break;
|
|
case 5:
|
|
case 5:
|