单据复制一二次复核

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

@@ -109,6 +109,7 @@ public class ConstantStatus {
     public static final int FROM_CHANGE = 6;       //单据流转
     public static final int FROM_UDISP = 7;      //供应商平台
     public static final int FROM_PEACE_CHANGE = 8;       //平衡补单
+    public static final int FROM_COPY = 10;           //单据复制
 
 
     //DI类型

api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java

@@ -431,6 +431,7 @@ public class StockOrderController {
         originOrder.setReceiveStatus(0); //设置验收状态为未验收
         originOrder.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
         originOrder.setErpFk(null);//关联业务单据置空
+        originOrder.setFromType(ConstantStatus.FROM_COPY);
         originOrder.setLocStorageCode(addStockOrderChangeRequest.getLocStorageCode());
         BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(originOrder.getAction());
         String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + MyStrUtil.trim(bussinessTypeEntity.getPrefix()), "yyyyMMdd"));

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

@@ -196,6 +196,10 @@ public class CheckOrderUtils {
                 if (bussinessTypeEntity.isSecCheckSp()) {
                     return ConstantStatus.SORDER_CHECKED;
                 }
+            } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_COPY) {
+                if (bussinessTypeEntity.isSecCheckCopy()) {
+                    return ConstantStatus.SORDER_CHECKED;
+                }
             }
         } else {
             return ConstantStatus.SORDER_DELIVER;

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

@@ -70,4 +70,7 @@ public class BussinessTypeEntity {
     private int orderVisibleType;   //订单详情展示方式：0：根据批次号展示，1:根据条码展示
 
     private boolean supplementAll;
+
+    private boolean checkCopy;
+    private boolean secCheckCopy;
 }

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

@@ -72,4 +72,6 @@ public class BussinessTypResponse {
 
     private int orderVisibleType;   //订单详情展示方式：0：根据批次号展示，1:根据条码展示
     private boolean supplementAll;      //是否全量补单
+    private boolean checkCopy;
+    private boolean secCheckCopy;
 }

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

@@ -610,6 +610,11 @@ public class IoTransInoutService {
                     unCheckFinish(orderEntity, warehouseEntityList);
                     return;
                 }
+            } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_COPY) {
+                if (!bussinessTypeEntity.isCheckCopy()) {
+                    unCheckFinish(orderEntity, warehouseEntityList);
+                    return;
+                }
             }
             genOrderDetail(warehouseEntityList);
 //            checkMutiDi(orderEntity.getId(), bussinessTypeEntity);   //校验一个DI是否绑定多个产品ID
@@ -940,7 +945,16 @@ public class IoTransInoutService {
                 if (bussinessTypeEntity.isSecCheckChange()) {
                     stockOrderEntity.setStatus(ConstantStatus.SORDER_CHECKED);
                 }
+            } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_PEACE_CHANGE) {
+                if (bussinessTypeEntity.isSecCheckBalacne()) {
+                    stockOrderEntity.setStatus(ConstantStatus.SORDER_CHECKED);
                 }
+            } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_COPY) {
+                if (bussinessTypeEntity.isSecCheckCopy()) {
+                    stockOrderEntity.setStatus(ConstantStatus.SORDER_CHECKED);
+                }
+            }
+
         } else {
             stockOrderEntity.setStatus(ConstantStatus.SORDER_DELIVER);
 

api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml

@@ -20,7 +20,8 @@
         basic_bustype_local.spUse,corpType,basic_bussiness_type.storageCode,basic_bussiness_type.checkBalacne,
         basic_bussiness_type.secCheckBalacne, defaultUnit,basic_bustype_origin.action
         thirdAction,basic_bustype_origin.thirdSys,basic_bussiness_type.useDyCount,basic_bussiness_type.expireTip,basic_bussiness_type.prefix,basic_bustype_local.prefix
-        localPrefix,basic_bustype_local.preIn,basic_bussiness_type.defaultSubInv,basic_bussiness_type.defaultInv,orderVisibleType,supplementAll
+        localPrefix,basic_bustype_local.preIn,basic_bussiness_type.defaultSubInv,basic_bussiness_type.defaultInv,orderVisibleType,supplementAll,
+        checkCopy,secCheckCopy
         FROM basic_bussiness_type LEFT JOIN basic_bustype_local
         on basic_bussiness_type.localAction = basic_bustype_local.action
         left join basic_bustype_origin on basic_bustype_local.originAction = basic_bustype_origin.action
@@ -138,7 +139,8 @@
         basic_bussiness_type.secCheckBalacne,basic_bustype_origin.action
         thirdAction,basic_bustype_origin.thirdSys,useDyCount,basic_bussiness_type.expireTip,
         basic_bussiness_type.prefix,basic_bustype_local.prefix
-        localPrefix,basic_bustype_local.preIn,basic_bussiness_type.defaultSubInv,basic_bussiness_type.defaultInv,orderVisibleType,supplementAll
+        localPrefix,basic_bustype_local.preIn,basic_bussiness_type.defaultSubInv,basic_bussiness_type.defaultInv,orderVisibleType,supplementAll,
+        checkCopy,secCheckCopy
         FROM basic_bussiness_type LEFT JOIN basic_bustype_local
         on basic_bussiness_type.localAction = basic_bustype_local.action
         left join basic_bustype_origin on basic_bustype_local.originAction = basic_bustype_origin.action
@@ -192,7 +194,7 @@
         ,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew,
         secCheckChange,corpType,basic_bussiness_type.storageCode,checkBalacne,
         secCheckBalacne,supplementOrderType,defaultUnit,useDyCount,expireTip,updateTime,prefix
-        ,ullageFill,scanPreIn,vailInv,codeFillCheck,defaultSubInv,outTospms,entrutSpms,defaultInv,orderVisibleType)
+        ,ullageFill,scanPreIn,vailInv,codeFillCheck,defaultSubInv,outTospms,entrutSpms,defaultInv,orderVisibleType,checkCopy,secCheckCopy)
         values
             (
         #{action},
@@ -236,7 +238,8 @@
         #{outTospms},
         #{entrutSpms},
         #{defaultInv},
-        #{orderVisibleType}
+        #{orderVisibleType},
+        #{checkCopy},#{secCheckCopy}
         )
     </insert>
 
@@ -251,7 +254,7 @@
         checkUdims,checkPdaEd,checkPdaUn,checkPc,checkWebNew,checkChange
         ,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew,
         secCheckChange,corpType,storageCode,checkBalacne,secCheckBalacne,supplementOrderType,defaultUnit,useDyCount,expireTip,updateTime,prefix
-        ,ullageFill,scanPreIn,vailInv,codeFillCheck,defaultSubInv,outTospms,entrutSpms,defaultInv,orderVisibleType)
+        ,ullageFill,scanPreIn,vailInv,codeFillCheck,defaultSubInv,outTospms,entrutSpms,defaultInv,orderVisibleType, checkCopy,secCheckCopy)
         values
             (
         #{index},
@@ -296,7 +299,7 @@
         #{outTospms},
         #{entrutSpms},
         #{defaultInv},
-        #{orderVisibleType}
+        #{orderVisibleType}, #{checkCopy},#{secCheckCopy}
         )
     </insert>
 
@@ -349,6 +352,8 @@
 
             <if test="entrutSpms != null">entrutSpms=#{entrutSpms},</if>
             <if test="orderVisibleType != null">orderVisibleType=#{orderVisibleType},</if>
+            <if test="checkCopy != null">checkCopy=#{checkCopy},</if>
+            <if test="secCheckCopy != null">secCheckCopy=#{secCheckCopy},</if>
 
             thirdSysFk=#{thirdSysFk},
         </trim>