代码备份

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

@@ -1016,6 +1016,10 @@ public class IoTransInoutService {
                 if (bussinessTypeEntity.isSecCheckBalacne()) {
                     stockOrderEntity.setStatus(ConstantStatus.SORDER_CHECKED);
                 }
+            } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_UDIWMS) {
+                if (bussinessTypeEntity.isSecCheckUdiwms()) {
+                    stockOrderEntity.setStatus(ConstantStatus.SORDER_CHECKED);
+                }
             } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_COPY) {
                 if (bussinessTypeEntity.isSecCheckCopy()) {
                     stockOrderEntity.setStatus(ConstantStatus.SORDER_CHECKED);

api-admin/src/main/java/com/glxp/sale/admin/util/BusTypeCheckUtils.java

@@ -91,6 +91,10 @@ public class BusTypeCheckUtils {
                 if (bussinessTypeEntity.isSecCheckBalacne()) {
                     return true;
                 }
+            }else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_UDIWMS) {
+                if (bussinessTypeEntity.isSecCheckUdiwms()) {
+                    return true;
+                }
             } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_COPY) {
                 if (bussinessTypeEntity.isSecCheckCopy()) {
                     return true;

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

@@ -21,12 +21,14 @@
                basic_bussiness_type.checkPc,
                basic_bussiness_type.checkWebNew,
                basic_bussiness_type.checkChange,
+               basic_bussiness_type.checkUdiwms,
                basic_bussiness_type.codeFillCheck,
                basic_bussiness_type.secCheckUdims,
                basic_bussiness_type.secCheckPdaEd,
                basic_bussiness_type.secCheckPdaUn,
                basic_bussiness_type.secCheckWebNew,
                basic_bussiness_type.secCheckChange,
+               basic_bussiness_type.secCheckUdiwms,
                basic_bussiness_type.ullageFill,
                basic_bussiness_type.scanPreIn,
                basic_bussiness_type.vailInv,
@@ -187,6 +189,8 @@
                basic_bussiness_type.checkPc,
                basic_bussiness_type.checkWebNew,
                basic_bussiness_type.checkChange,
+               basic_bussiness_type.checkUdiwms,
+               basic_bussiness_type.secCheckUdiwms,
                basic_bussiness_type.codeFillCheck,
                basic_bussiness_type.secCheckUdims,
                basic_bussiness_type.secCheckPdaEd,
@@ -277,8 +281,9 @@
                         , secCheckUdims, secCheckPdaEd, secCheckPdaUn, secCheckPc, secCheckWebNew,
                  secCheckChange, corpType, basic_bussiness_type.storageCode, checkBalacne,
                  secCheckBalacne, supplementOrderType, defaultUnit, useDyCount, expireTip, updateTime, prefix
-            , ullageFill, scanPreIn, vailInv, codeFillCheck, defaultSubInv, defaultInv, orderVisibleType, checkCopy,
+                        , ullageFill, scanPreIn, vailInv, codeFillCheck, defaultSubInv, defaultInv, orderVisibleType,
-         secCheckCopy, vailDispatch, vailGroupBuy)
+                 checkCopy,
+                 secCheckCopy, vailDispatch, vailGroupBuy, checkUdiwms, secCheckUdiwms)
         values (#{action},
                 #{name},
                 #{enable},
@@ -320,7 +325,7 @@
                 #{defaultInv},
                 #{orderVisibleType},
                 #{checkCopy},
-                #{secCheckCopy}, #{vailDispatch}, #{vailGroupBuy})
+                #{secCheckCopy}, #{vailDispatch}, #{vailGroupBuy}, #{checkUdiwms}, #{secCheckUdiwms})
     </insert>
 
 
@@ -335,8 +340,9 @@
                         , secCheckUdims, secCheckPdaEd, secCheckPdaUn, secCheckPc, secCheckWebNew,
                  secCheckChange, corpType, storageCode, checkBalacne, secCheckBalacne, supplementOrderType, defaultUnit,
                  useDyCount, expireTip, updateTime, prefix
-            , ullageFill, scanPreIn, vailInv, codeFillCheck, defaultSubInv, defaultInv, orderVisibleType, checkCopy,
+                        , ullageFill, scanPreIn, vailInv, codeFillCheck, defaultSubInv, defaultInv, orderVisibleType,
-         secCheckCopy, vailDispatch, vailGroupBuy)
+                 checkCopy,
+                 secCheckCopy, vailDispatch, vailGroupBuy, checkUdiwms, secCheckUdiwms)
         values (#{index},
                 #{action},
                 #{name},
@@ -379,7 +385,7 @@
                 #{defaultInv},
                 #{orderVisibleType},
                 #{checkCopy},
-                #{secCheckCopy}, #{vailDispatch}, #{vailGroupBuy})
+                #{secCheckCopy}, #{vailDispatch}, #{vailGroupBuy}, #{checkUdiwms}, #{secCheckUdiwms})
     </insert>
 
 
@@ -518,6 +524,12 @@
             <if test="vailGroupBuy != null">
                 vailGroupBuy=#{vailGroupBuy},
             </if>
+            <if test="checkUdiwms != null">
+                checkUdiwms=#{checkUdiwms},
+            </if>
+            <if test="secCheckUdiwms != null">
+                secCheckUdiwms=#{secCheckUdiwms},
+            </if>
 
             thirdSysFk=#{thirdSysFk},
         </trim>