|
@@ -145,13 +145,16 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
|
|
|
String orderNumber = (String) map.get("orderNumber");
|
|
|
|
|
|
Map<String, Object> mesMap = utilsMapper.getOrderTypeByOrderNumber(orderNumber);
|
|
|
+
|
|
|
+ BigDecimal totalId = DataChange.dataToBigDecimal(mesMap.get("totalId"));
|
|
|
+ Integer netWeight = tmstruckUnloadResultMapper.getNetWeightByTotalId(totalId);
|
|
|
+
|
|
|
int orderType = DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue();
|
|
|
|
|
|
if(orderType == 11 || orderType == 15 || orderType == 16){
|
|
|
|
|
|
Integer sqe = utilsMapper.getLineSequenceByOrderNumber((String) map.get("orderNumber"));
|
|
|
sqe = sqe == null ? 1 : sqe +1;
|
|
|
- BigDecimal totalId = DataChange.dataToBigDecimal(mesMap.get("totalId"));
|
|
|
map.put("resultId",tmstruckUnloadResultMapper.selectMaxId());
|
|
|
map.put("Sqe",sqe);
|
|
|
map.put("totalId",totalId);
|
|
@@ -159,8 +162,7 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
|
|
|
tmstruckUnloadResultMapper.insertSelective(tmstruckUnloadResult);
|
|
|
|
|
|
|
|
|
-
|
|
|
- Integer netWeight = tmstruckUnloadResultMapper.getNetWeightByTotalId(totalId);
|
|
|
+
|
|
|
if(netWeight == 0){
|
|
|
mesMap.put("orderLineSequence",sqe);
|
|
|
utilsService.updateOrderLineSqeByOrderNumber(mesMap);
|
|
@@ -193,9 +195,11 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
|
|
|
}
|
|
|
map.putAll(dataMap);
|
|
|
updateUnloadResultBy(map);
|
|
|
-
|
|
|
- map.put("orderId", mesMap.get("orderId"));
|
|
|
- utilsService.updateOrderLineSequence(map);
|
|
|
+ if(netWeight == 0){
|
|
|
+
|
|
|
+ map.put("orderId", mesMap.get("orderId"));
|
|
|
+ utilsService.updateOrderLineSequence(map);
|
|
|
+ }
|
|
|
switch (orderType){
|
|
|
case 5:
|
|
|
case 6:
|