From 35594d91a261b15531570660dcf62cdb5ba2e5cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Fri, 14 Jul 2023 17:56:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=9F=A5=E8=AF=A2=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D=EF=BC=88=E5=B8=A6=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/constant/Constant.java | 1 + .../basic/impl/BasicBussinessTypeServiceImpl.java | 15 +++++++++++++++ 2 files changed, 16 insertions(+) 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();