|
@@ -1642,6 +1642,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
|
|
|
BigDecimal materialId = new BigDecimal((Integer) mapValue.get("materialId"));
|
|
|
BigDecimal orderType = new BigDecimal((Integer) mapValue.get("orderType"));
|
|
|
BigDecimal lineId = new BigDecimal((Integer) mapValue.get("lineId"));
|
|
|
+ Integer planId = (Integer) mapValue.get("planId");
|
|
|
int result = 0;
|
|
|
for (Map<String, Object> map : mapList) {
|
|
|
OmstruckOrder omstruckOrder = new OmstruckOrder();
|
|
@@ -1650,7 +1651,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
|
|
|
BigDecimal orderMaterialId = omstruckOrderMaterialMapper.selectMaxId();
|
|
|
String capacityNumber = (String)map.get("capacityNumber");
|
|
|
BigDecimal capacityId = omstruckOrderMapper.getCapacityId(capacityNumber);
|
|
|
- BigDecimal materialWeight = DataChange.dataToBigDecimal(map.get("materialWeight"));
|
|
|
+ BigDecimal materialWeight = DataChange.dataToBigDecimal(map.get("orderMaterialWeight"));
|
|
|
String unloadPoint = (String) map.get("unloadPoint");
|
|
|
BigDecimal unloadPointId = omstruckOrderMapper.getUnloadPointId(unloadPoint);
|
|
|
// Date orderEntryTime = new Date((Long) map.get("orderEntryTime"));
|
|
@@ -1678,7 +1679,9 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
|
|
|
//新增实绩总表关联订单 feign 调用truckTms
|
|
|
map.put("orderId", omstruckOrder.getOrderId());
|
|
|
tmsTruckFeign.addTotalResult(map);
|
|
|
-// amsFeign.updateMaterial(map); //更改运输计划子表 增加已分配重量 减少未分配重量 feign调用ams
|
|
|
+ //更改运输计划子表 增加已分配重量 减少未分配重量 feign调用ams
|
|
|
+ map.put("planId",planId);
|
|
|
+ amsFeign.updateMaterial(map);
|
|
|
}
|
|
|
return result;
|
|
|
}
|