atydasj

src/main/java/com/steerinfo/dil/mapper/TmstruckLeaveFactoryResultMapper.java

@@ -71,4 +71,6 @@ public interface TmstruckLeaveFactoryResultMapper extends IBaseMapper<TmstruckLe
     Double getNowNetWeight(String orderNumber);
     // 得到销售订单id
     BigDecimal getSaleOrderId(String orderNumber);
+
+    Integer getOrderStatus(BigDecimal orderId);
 }

src/main/java/com/steerinfo/dil/service/impl/TmstruckLeaveFactoryResultServiceImpl.java

@@ -290,8 +290,8 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 //判断出厂路段顺序号是否为最后一个 采购订单关闭订单
                 i += utilsService.closeOrderNormally(map);
                 //根据运输订单ID查询路段顺序号
-                Integer seq = tmstruckLeaveFactoryResultMapper.getSeq(orderId);
-                if(seq == 10){
+                Integer orderStatus = tmstruckLeaveFactoryResultMapper.getOrderStatus(orderId);
+                if(orderStatus == 2){
                     //判断是否满足条件--计划是否被启用
                     Integer j = tmstruckLeaveFactoryResultMapper.getPlanEnable(orderId);
                     if(j == 1){

src/main/java/com/steerinfo/dil/service/impl/UtilsServiceImpl.java

@@ -70,8 +70,7 @@ public class UtilsServiceImpl implements IUtilsService {
         BigDecimal maxSeq = DataChange.dataToBigDecimal(mesMap.get("maxSeq"));
         if(orderSeq.intValue() == maxSeq.intValue()){
             map.put("orderStatus", 2);
-            utilsMapper.updateOrderStatusByOrderIdOrNum(map);
-
+            return utilsMapper.updateOrderStatusByOrderIdOrNum(map);
         }
         if(map.get("priceId")!=null){
             //如果有价格ID 则说明需要结算 调用新增详单接口

src/main/resources/com/steerinfo/dil/mapper/TmstruckLeaveFactoryResultMapper.xml

@@ -1297,4 +1297,8 @@
         ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         WHERE OO.ORDER_NUMBER = #{orderNumber}
     </select>
+    <select id="getOrderStatus" resultType="java.lang.Integer" parameterType="DECIMAL">
+        SELECT OO.ORDER_STATUS  FROM OMSTRUCK_ORDER OO
+        WHERE OO.ORDER_ID   = #{orderId}
+    </select>
 </mapper>