From 642430e499913c08db801bcace3fd07384ca9329 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Tue, 3 Jan 2023 17:22:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=93=E5=BA=93=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E7=BB=91=E5=AE=9A=E7=94=A8=E6=88=B7=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E8=80=97=E6=9D=90=E5=AD=97=E5=85=B8=E6=9F=A5=E8=AF=A2=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/admin/entity/basic/UdiInfoEntity.java | 1 + .../glxp/api/admin/service/basic/SyncUdiService.java | 6 +++--- .../admin/service/inout/WarehouseUserService.java | 2 -- .../admin/service/inout/impl/OrderServiceImpl.java | 12 ++++++++---- .../main/resources/mybatis/mapper/inout/OrderDao.xml | 3 +++ 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoEntity.java index f1501d6c..a697b532 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoEntity.java @@ -59,6 +59,7 @@ public class UdiInfoEntity { private String supId; private boolean isAdavence; private boolean isDisable; + private boolean useMuti; private Boolean isCheck; private boolean allowNoBatch; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/SyncUdiService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/SyncUdiService.java index 9095be50..46be200a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/SyncUdiService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/SyncUdiService.java @@ -77,11 +77,11 @@ public class SyncUdiService { if (productInfoFilterRequest.getZczbhhzbapzbh() != null && !productInfoFilterRequest.getZczbhhzbapzbh().equals("")) { return ResultVOUtils.error(500, "请输入医疗器械注册备案人名称"); } + if (productInfoFilterRequest.getCpmctymc() != null && !productInfoFilterRequest.getCpmctymc().equals("") && productInfoFilterRequest.getCpmctymc().length() < 4) { + return ResultVOUtils.error(500, "请输入完整的产品通用名称！"); + } } - if (productInfoFilterRequest.getCpmctymc() != null && !productInfoFilterRequest.getCpmctymc().equals("") && productInfoFilterRequest.getCpmctymc().length() < 4) { - return ResultVOUtils.error(500, "请输入完整的产品通用名称！"); - } productInfoFilterRequest.setIsNewest(1); // productInfoFilterRequest.setDiType("1"); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseUserService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseUserService.java index 73af6e87..8d306ac7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseUserService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseUserService.java @@ -68,7 +68,5 @@ public interface WarehouseUserService { */ Integer countUserBySubInvCode(String subInvCode); - /** 查询出取消的用户 ...*/ - List getNotWarehouseUserList(FilterInvLinkDataRequest filterInvLinkDataRequest); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java index 1e8f0d00..dd1b7aef 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java @@ -27,6 +27,7 @@ import com.glxp.api.admin.entity.inout.WarehouseEntity; import com.glxp.api.admin.entity.inventory.InvProductDetailEntity; import com.glxp.api.admin.entity.inventory.InvProductEntity; import com.glxp.api.admin.entity.inventory.InvSubWarehouseEntity; +import com.glxp.api.admin.entity.inventory.InvWarehouseEntity; import com.glxp.api.admin.req.business.StockOrderFilterRequest; import com.glxp.api.admin.req.inout.OrderFilterRequest; import com.glxp.api.admin.req.inout.OrderQueryRequest; @@ -314,11 +315,14 @@ public class OrderServiceImpl implements OrderService { supplementOrder.setReceiveStatus(0); //设置验收状态为未验收 supplementOrder.setCorpOrderId(CustomUtil.getId() + "x"); //修改往来单位及当前库存号 - supplementOrder.setFromCorpId(order.getLocStorageCode()); + supplementOrder.setFromCorpId(order.getInvWarehouseCode()); + supplementOrder.setSubInvCode(order.getInvStorageCode()); supplementOrder.setFromSubInvCode(order.getInvWarehouseCode()); - supplementOrder.setLocStorageCode(order.getFromCorpId()); - supplementOrder.setInvWarehouseCode(null); - String name = invWarehouseDao.getNameByCode(supplementOrder.getFromCorpId()); + //根据分库code查询总库coder + InvSubWarehouseEntity invSubWarehouseEntity=invSubWarehouseDao.filterGroupInvSubAndcode(order.getFromCorpId()); + supplementOrder.setLocStorageCode(invSubWarehouseEntity.getParentId()); + supplementOrder.setInvStorageCode(invSubWarehouseEntity.getParentId()); + String name = invWarehouseDao.getNameByCode(order.getInvStorageCode()); if (StrUtil.isNotEmpty(order.getFromSubInvCode())) { supplementOrder.setInvWarehouseCode(order.getFromSubInvCode()); } else { diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml index e44d966d..01147231 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml @@ -335,6 +335,9 @@ and exportStatus = #{exportStatus} + + and erpFk = #{erpFk} + and signStatus = #{signStatus}