|
@@ -145,13 +145,16 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
|
|
|
String orderNumber = (String) map.get("orderNumber");
|
|
|
//通过订单号查询订单类型 及总实绩Id
|
|
|
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); //更新卸货实绩
|
|
|
- //路段顺序号 + 1
|
|
|
- map.put("orderId", mesMap.get("orderId"));
|
|
|
- utilsService.updateOrderLineSequence(map);
|
|
|
+ if(netWeight == 0){ //如果没有净重 则更新路段顺序号 有则不更新
|
|
|
+ //路段顺序号 + 1
|
|
|
+ map.put("orderId", mesMap.get("orderId"));
|
|
|
+ utilsService.updateOrderLineSequence(map);
|
|
|
+ }
|
|
|
switch (orderType){
|
|
|
case 5:
|
|
|
case 6:
|