ada

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

@@ -167,8 +167,8 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
         else if (orderType == 21){//调用计时作业方法
             return orderType21Use(map, orderNumber, DataChange.dataToBigDecimal(mesMap.get("orderId")));
         }
-        //如果订单类型为2 则需要财务公司审核才能进厂
-        if(orderType == 2 || orderType == 1){
+        //如果订单类型为2 则需要财务公司审核才能进厂//如果订单为销售，1,2,内转钢材异地库-4
+        if(orderType == 2 || orderType == 1 ||  orderType == 4){
             Integer saleOrderStatus = tmstruckEnfactoryResultMapper.getSaleOrderStatus(DataChange.dataToBigDecimal(mesMap.get("orderId")));
             if(saleOrderStatus != 4){
                throw new Exception("审批未通过不能进厂！");
@@ -192,6 +192,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
         int checkMeasureCommission = 0;
         switch (orderType){
             case 1:
+            case 4:
                 checkMeasureCommission = steelOrderEnFactory(map, selectMap, resultTotalId);
                 break;
             case 2:

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

@@ -266,6 +266,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 bmsTruckFeign.addDetailsOrder(orderId);
                 break;
             case 4:
+                i += utilsService.closeOrderNormally(map);
                 break;
             case 5:
             case 6: