From 50edb4e7478230c5d25608a1088359d59670c057 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 16:41:24 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=EF=BC=88=E5=B8=A6=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/inout/IoOrderController.java | 7 ++++++- .../api/service/basic/UdiContrastService.java | 15 +++++++++++++++ .../service/inout/impl/IoOrderServiceImpl.java | 4 ++++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index 7404e4da8..7b854521b 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -130,7 +130,12 @@ public class IoOrderController extends BaseController { orderService.setFilterStatus(filterOrderRequest); } if (StrUtil.isNotBlank(filterOrderRequest.getVueType())) { - orderService.setActions(filterOrderRequest); + //要是不存在要查询的单据类型就直接放回空 + if(orderService.setActions(filterOrderRequest) == null){ + PageInfo pageInfo = new PageInfo<>(new ArrayList<>()); + return ResultVOUtils.page(pageInfo); + } + } if (StrUtil.isNotEmpty(filterOrderRequest.getSupInoivceSearch())) { diff --git a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java index 5238a4b8a..50516d533 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java @@ -3,6 +3,7 @@ package com.glxp.api.service.basic; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.dao.basic.UdiRelevanceDao; import com.glxp.api.entity.basic.UdiProductEntity; @@ -207,13 +208,27 @@ public class UdiContrastService { } public void insertUdiInfos(List udiInfoEntities) { + Boolean falg=false; + String uuid=""; if (CollUtil.isNotEmpty(udiInfoEntities)) { UdiProductEntity udiProductEntity = udiProductService.findByUuid(udiInfoEntities.get(0).getUuid()); if (udiProductEntity == null) { for (UdiProductEntity udiInfoEntity : udiInfoEntities) { udiInfoEntity.setId(IdUtil.getSnowflakeNextId()); + if(udiInfoEntity.getZxxsbzbhsydysl()>0){ + uuid=udiInfoEntity.getUuid(); + falg=true; + } } udiProductService.insertUdiInfos(UdiInfoUtil.initUdiInfoEntitys(udiInfoEntities)); + //判断产品zxxsbzbhsydysl大于0就启动使用单元 + if(falg){ + QueryWrapper ew=new QueryWrapper<>(); + ew.eq("uuid",uuid); + UdiRelevanceEntity udiRelevanceEntity=new UdiRelevanceEntity(); + udiRelevanceEntity.setIsUseDy(true); + udiRelevanceService.update(udiRelevanceEntity,ew); + } } } } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index e8ed53f60..9ba173236 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -49,6 +49,7 @@ import com.glxp.api.util.MsDateUtil; import com.glxp.api.util.IntUtil; import com.glxp.api.util.udi.UdiCalCountUtil; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.BeanUtils; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -709,6 +710,9 @@ public class IoOrderServiceImpl implements IoOrderService { if (filterOrderRequest.getVueType() == null) return null; bussinessTypeEntities = basicBussinessTypeService.findByVueType(filterOrderRequest.getVueType()); + if(CollectionUtils.isEmpty(bussinessTypeEntities)){ + return null; + } actions = bussinessTypeEntities.stream().map(BasicBussinessTypeEntity::getAction).collect(Collectors.toList()); filterOrderRequest.setActions(actions); return actions; From 01219e3f5be44c68c72771be6e6eb17c6cd83dcc 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:07:18 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=EF=BC=88=E5=B8=A6=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/controller/inout/IoOrderController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index 7b854521b..e3392e4f9 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -97,8 +97,10 @@ public class IoOrderController extends BaseController { } if (StrUtil.isNotBlank(filterOrderRequest.getVueType())) { orderService.setActions(filterOrderRequest); + //要是不存在要查询的单据类型就直接放回空 if (CollUtil.isEmpty(filterOrderRequest.getActions())) { - return ResultVOUtils.success(null); + PageInfo pageInfo = new PageInfo<>(new ArrayList<>()); + return ResultVOUtils.page(pageInfo); } } if (StrUtil.isNotEmpty(filterOrderRequest.getSupInoivceSearch())) { From 33cb628f223849c74672b1938142b5de010e89b9 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 14 Jul 2023 17:40:24 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=89=A9=E8=B5=84=E7=B1=BB=E5=88=AB=20?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=81=9C=E7=94=A8=E4=BA=A7=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/basic/BasicProductCategoryController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicProductCategoryController.java b/src/main/java/com/glxp/api/controller/basic/BasicProductCategoryController.java index f7f088ea2..c446abf4a 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicProductCategoryController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicProductCategoryController.java @@ -227,6 +227,7 @@ public class BasicProductCategoryController { list.add(udiRelevanceResponse.getId()); } filterUdiRelRequest.setExistid(list); + filterUdiRelRequest.setIsDisable(false); List udiRelevanceResponses = null; 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 4/5] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=EF=BC=88=E5=B8=A6=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=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(); From c95b52a538f9c3d8088e036d7e09303225b786ec Mon Sep 17 00:00:00 2001 From: 1178634255 <1178634255@qq.com> Date: Fri, 14 Jul 2023 18:11:27 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E8=AE=A2=E5=8D=95-=E4=BA=A7=E5=93=81=E5=BD=95=E5=85=A5?= =?UTF-8?q?=EF=BC=9A=E7=94=9F=E4=BA=A7=E4=BC=81=E4=B8=9A=E3=80=81=E6=B3=A8?= =?UTF-8?q?=E5=86=8C/=E5=A4=87=E6=A1=88=E8=AF=81=E5=8F=B7=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=A1=86=E6=97=A0=E6=B3=95=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml index 6baa5d2d8..367b54a95 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml @@ -116,6 +116,9 @@ AND basic_products.ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc}, '%') + + AND basic_products.manufactory LIKE concat(#{manufactory}, '%') + AND cpmctymc LIKE concat('%', #{cpmctymc}, '%') @@ -148,7 +151,7 @@ AND basic_udirel.thirdId = #{thirdId} - AND zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh}, '%') + AND basic_products.zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh}, '%') AND diType = #{diType}