txf 3 years ago
parent
commit
06f2beab5a

+ 1 - 1
src/main/java/com/steerinfo/dil/feign/OmsFeign.java

@@ -47,6 +47,6 @@ public interface OmsFeign {
     Map<String,Object> addPurInwardOrder(@RequestParam BigDecimal orderId);
 
     @PostMapping("api/v1/oms/omstruckorderseparates/closeInwardOrder")
-    Map<String,Object> closeInwardOrder(@RequestParam Integer orderId);
+    Map<String,Object> closeInwardOrder(@RequestParam("orderId") Integer orderId, @RequestParam("sqe") Integer sqe);
 
 }

+ 2 - 4
src/main/java/com/steerinfo/dil/service/impl/TmstruckUnloadResultServiceImpl.java

@@ -153,10 +153,8 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             map.put("totalId",totalId);
             i += tmstruckUnloadResultMapper.insertSelective(generateUnload(map));
             //更新路段顺序号
-            mesMap.put("orderLineSequence",sqe);
-            i += utilsService.updateOrderLineSqeByOrderNumber(mesMap);
-            //内转只要是卸货都直接关闭订单
-            omsFeign.closeInwardOrder(DataChange.dataToBigDecimal(mesMap.get("orderId")).intValue());
+            //内转只要是卸货都直接关闭订单 事务跨服务更改同表同一行数据 不能调用 会锁行
+            omsFeign.closeInwardOrder(DataChange.dataToBigDecimal(mesMap.get("orderId")).intValue(), sqe);
             //卸货成功后推送消息给websocket
             utilsService.pushMesToWebsocket((String) map.get("capacityNumber"), "卸货");
             return i;