备份

src/main/java/com/glxp/api/constant/Constant.java

@@ -284,6 +284,8 @@ public class Constant {
     public static final String ORDER_ACTION_SUP_DELAUDIT = "supDelAudit";
     public static final String ORDER_ACTION_SUP_INOUT = "supInout";
     public static final String ORDER_ACTION_SUP_PREIN = "preInOrder";
+    public static final String ORDER_ACTION_WAIT_CHECK = "waitCheck";   //待校验
+    public static final String ORDER_ACTION_WAIT_DEAL = "waitDeal";     //待配货/拣货
 
     public static final String SYNC_REMARK = "syncRemark";
 }

src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java

@@ -579,13 +579,13 @@ public class IoCodeTempController extends BaseController {
                 }
 
 
-                if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL && bussinessTypeEntity.isCheckEnable()) {
+                if (bussinessTypeEntity.getCheckWebNew() == 1 && bussinessTypeEntity.isCheckEnable()) {
                     String errMsg = ioCheckInoutService.checkCode(genDetaiEntity);
                     if (errMsg != null) {
                         return ResultVOUtils.error(500, errMsg);
                     } else
                         codeTempService.updateById(exitLocalEntity);
-                } else if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_WAIT && bussinessTypeEntity.isCheckEnable()) {
+                } else if (bussinessTypeEntity.getCheckWebNew() == 2 && bussinessTypeEntity.isCheckEnable()) {
                     String errMsg = ioCheckInoutService.checkNoPiCode(genDetaiEntity);
                     if (errMsg != null) {
                         return ResultVOUtils.error(500, errMsg);

src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java

@@ -257,6 +257,17 @@ public class BasicBussinessTypeServiceImpl extends ServiceImpl<BasicBussinessTyp
                 bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
                         .gt("spUse", 0).eq("enable", true).eq("corpType", ConstantStatus.CORP_TYPE_OUT).eq("actionType", 2)
                         .eq("inStock", true).eq("mainAction", ConstantType.TYPE_PUT));
+                break;
+            case Constant.ORDER_ACTION_WAIT_CHECK:
+                bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
+                        .gt("spUse", 0).eq("enable", true).eq("corpType", ConstantStatus.CORP_TYPE_OUT).eq("actionType", 2)
+                        .eq("inStock", true).eq("mainAction", ConstantType.TYPE_PUT));
+                break;
+            case Constant.ORDER_ACTION_WAIT_DEAL:
+                bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
+                        .gt("spUse", 0).eq("enable", true).eq("corpType", ConstantStatus.CORP_TYPE_OUT).eq("actionType", 2)
+                        .eq("inStock", true).eq("mainAction", ConstantType.TYPE_PUT));
+                break;
 
             default:
                 break;