diff --git a/src/main/java/com/glxp/api/constant/Constant.java b/src/main/java/com/glxp/api/constant/Constant.java index 77e5e1bba..e8496ecaf 100644 --- a/src/main/java/com/glxp/api/constant/Constant.java +++ b/src/main/java/com/glxp/api/constant/Constant.java @@ -287,6 +287,7 @@ public class Constant { public static final String ORDER_ACTION_WAIT_CHECK = "waitCheck"; //待校验 public static final String ORDER_ACTION_WAIT_DEAL = "waitDeal"; //待配货/拣货 public static final String ORDER_THIRD_UPLOAD = "thirdUpload"; + public static final String ORDER_THIRD_STOCK = "stock"; //内部码 public static final String SYNC_REMARK = "syncRemark"; } diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java index c5ac51e98..6e3ce6ca0 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java @@ -295,6 +295,21 @@ public class BasicBussinessTypeServiceImpl extends ServiceImpl() + .eq("enable", true).and( + webNew -> webNew.in("checkWebNew", 1, 2, 3) + .or().in("checkPdaUn", 1, 2, 3) + .or().in("checkPdaEd", 1, 2, 3) + .or().in("checkUdims", 1, 2, 3) + .or().in("checkPc", 1, 2, 3) + .or().in("checkSp", 1, 2, 3) + .or().in("checkChange", 1, 2, 3) + .or().in("checkBalance", 1, 2, 3) + .or().in("checkCopy", 1, 2, 3) + ) + ); + break; case Constant.ORDER_THIRD_UPLOAD: List thrOrderUploadBustypesEntities = thrOrderUploadBustypesService.list();