Browse Source

修改卸货后可能需要除皮

txf 3 years ago
parent
commit
f714496172

+ 3 - 0
src/main/java/com/steerinfo/dil/mapper/TmstruckUnloadResultMapper.java

@@ -52,4 +52,7 @@ public interface TmstruckUnloadResultMapper extends IBaseMapper<TmstruckUnloadRe
     Integer selectUnloadMaterialId(Map<String,Object> map);
 
     Map<String,Object> selectOrderId(Map<String, Object> map);
+
+    //根据总实绩ID查询是否有净重
+    Integer getNetWeightByTotalId(BigDecimal totalId);
 }

+ 8 - 1
src/main/java/com/steerinfo/dil/service/impl/TmstruckUnloadResultServiceImpl.java

@@ -154,7 +154,14 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             i += tmstruckUnloadResultMapper.insertSelective(generateUnload(map));
             //更新路段顺序号
             //内转只要是卸货都直接关闭订单 事务跨服务更改同表同一行数据 不能调用 会锁行
-            omsFeign.closeInwardOrder(DataChange.dataToBigDecimal(mesMap.get("orderId")).intValue(), sqe);
+            //查询是否有净重 如果没有净重更新路段顺序号需要继续回皮 有就结束订单
+            Integer netWeight = tmstruckUnloadResultMapper.getNetWeightByTotalId(totalId);
+            if(netWeight == 0){
+                mesMap.put("orderLineSequence",sqe);
+                utilsService.updateOrderLineSqeByOrderNumber(mesMap);
+            }else {
+                omsFeign.closeInwardOrder(DataChange.dataToBigDecimal(mesMap.get("orderId")).intValue(), sqe);
+            }
             //卸货成功后推送消息给websocket
             utilsService.pushMesToWebsocket((String) map.get("capacityNumber"), "卸货");
             return i;

+ 4 - 0
src/main/resources/com/steerinfo/dil/mapper/TmstruckUnloadResultMapper.xml

@@ -1059,4 +1059,8 @@
                WHERE OO.ORDER_NUMBER = #{orderNumber}
     </select>
 
+    <select id="getNetWeightByTotalId" parameterType="java.math.BigDecimal" resultType="int">
+        select COUNT(TWR.RESULT_NET_WEIGHT) from TMSTRUCK_WEIGHT_RESULT TWR  where TWR.RESULT_TOTAL_ID = #{totalId}
+    </select>
+
 </mapper>