luobang 2 年之前
父節點
當前提交
43e7dababc
共有 1 個文件被更改,包括 5 次插入0 次删除
  1. 5 0
      src/main/java/com/steerinfo/dil/service/impl/AmsSaleOrderServiceImpl.java

+ 5 - 0
src/main/java/com/steerinfo/dil/service/impl/AmsSaleOrderServiceImpl.java

@@ -1207,6 +1207,8 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             omstruckOrder.setCanWork(new BigDecimal(0));
             omstruckOrder.setCanWork(new BigDecimal(0));
             // 下发时间
             // 下发时间
             omstruckOrder.setOrderIssueTime(new Date());
             omstruckOrder.setOrderIssueTime(new Date());
+            //如果该订单已有出厂实绩,不允许生成继续装
+            int outFactoryResult = amsSaleOrderMapper.selectOutFactoryResult(omstruckOrder.getOrderNumber());
             // 运单状态
             // 运单状态
             if(omstruckOrder.getOrderReceiveRefuseTime()!=null){
             if(omstruckOrder.getOrderReceiveRefuseTime()!=null){
                 omstruckOrder.setOrderStatus(new BigDecimal(7));
                 omstruckOrder.setOrderStatus(new BigDecimal(7));
@@ -3034,6 +3036,9 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         if(netWeight > 0 && outFactory == 0) {
         if(netWeight > 0 && outFactory == 0) {
             orderStatus = 2;
             orderStatus = 2;
         }
         }
+        if(netWeight > 0 && outFactory > 0) {
+            orderStatus = 5;
+        }
         return amsSaleOrderMaterialMapper.updateTransportOrderStatus(orderId,orderStatus);
         return amsSaleOrderMaterialMapper.updateTransportOrderStatus(orderId,orderStatus);
     }
     }