预验收库存，

api-admin/src/main/java/com/glxp/sale/admin/constant/ConstantStatus.java

@@ -95,6 +95,7 @@ public class ConstantStatus {
     public static final int FROM_CHANGE = 6;       //单据流转
     public static final int FROM_UDISP = 7;       //udi供应商平台
     public static final int FROM_PEACE_CHANGE = 8;       //平衡补单
+    public static final int FROM_UDIWMS = 9;
 
 
     //DI类型

api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java

@@ -287,6 +287,9 @@ public class SpsSyncUploadController {
                 OrderDao mapper = batchSession.getMapper(OrderDao.class);
                 for (OrderEntity orderEntity : orderEntities) {
                     orderEntity.setUpdateTime(null);
+                    orderEntity.setFromType(ConstantStatus.FROM_UDIWMS);
+                    orderEntity.setReceiveStatus(0);
+                    orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
                     orderService.deleteByOrderId(orderEntity.getId());
                     mapper.importOrder(orderEntity);
                 }

api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/CheckOrderUtils.java

@@ -191,6 +191,11 @@ public class CheckOrderUtils {
                     return ConstantStatus.SORDER_CHECKED;
                 }
             }
+            else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_UDIWMS) {
+                if (bussinessTypeEntity.isSecCheckUdiwms()) {
+                    return ConstantStatus.SORDER_CHECKED;
+                }
+            }
         } else {
             return ConstantStatus.SORDER_DELIVER;
         }

api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessTypeEntity.java

@@ -58,4 +58,7 @@ public class BussinessTypeEntity {
     private String localPrefix;
     private boolean preIn;
 
+    private boolean checkUdiwms;
+    private boolean secCheckUdiwms;
+
 }

api-admin/src/main/java/com/glxp/sale/admin/res/basic/BussinessTypResponse.java

@@ -58,4 +58,6 @@ public class BussinessTypResponse {
     private String prefix;
     private String localPrefix;
     private boolean preIn;
+    private boolean checkUdiwms;
+    private boolean secCheckUdiwms;
 }

api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java

@@ -501,6 +501,7 @@ public class InvProductsTrService {
         outOrder.setLocStorageCode(defaultWarehouseEntity.getCode());
         outOrder.setCreateUser(null);
         outOrder.setReviewUser(null);
+        outOrder.setPreCheck(false);
         orderService.insertOrder(outOrder);
         for (WarehouseEntity warehouseEntity : preOutList) {
             warehouseEntity.setOrderId(outOrder.getId());
@@ -576,6 +577,7 @@ public class InvProductsTrService {
             outOrder.setOriginUllageSupNo(orderEntity.getId());
             outOrder.setCreateUser(null);
             outOrder.setReviewUser(null);
+            outOrder.setPreCheck(false);
             orderService.insertOrder(outOrder);
             for (WarehouseEntity warehouseEntity : temps) {
                 warehouseEntity.setOrderId(outOrder.getId());
@@ -619,6 +621,7 @@ public class InvProductsTrService {
             outOrder.setOriginUllageSupNo(orderEntity.getId());
             outOrder.setCreateUser(null);
             outOrder.setReviewUser(null);
+            outOrder.setPreCheck(false);
             orderService.insertOrder(outOrder);
             warehouseEntity.setOrderId(outOrder.getId());
             warehouseEntity.setId(null);
@@ -690,6 +693,7 @@ public class InvProductsTrService {
             outOrder.setOriginUllageSupNo(orderEntity.getId());
             outOrder.setCreateUser(null);
             outOrder.setReviewUser(null);
+            outOrder.setPreCheck(false);
             orderService.insertOrder(outOrder);
             for (WarehouseEntity warehouseEntity : temps) {
                 warehouseEntity.setOrderId(outOrder.getId());
@@ -768,6 +772,7 @@ public class InvProductsTrService {
             outOrder.setOriginUllageSupNo(orderEntity.getId());
             outOrder.setCreateUser(null);
             outOrder.setReviewUser(null);
+            outOrder.setPreCheck(false);
             orderService.insertOrder(outOrder);
             for (WarehouseEntity warehouseEntity : temps) {
                 warehouseEntity.setOrderId(outOrder.getId());

api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java

@@ -584,6 +584,11 @@ public class IoTransInoutService {
                     unCheckFinish(orderEntity, warehouseEntityList);
                     return;
                 }
+            }else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_UDIWMS) {
+                if (!bussinessTypeEntity.isSecCheckUdiwms()) {
+                    unCheckFinish(orderEntity, warehouseEntityList);
+                    return;
+                }
             }
             genOrderDetail(warehouseEntityList);
 //            checkMutiDi(orderEntity.getId(), bussinessTypeEntity);   //校验一个DI是否绑定多个产品ID