From 873cfba0c07048fda94bbd3a0aeb2a133b74f881 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Thu, 8 Sep 2022 17:06:38 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/basic/UdiRelevanceController.java | 4 ++-- .../admin/controller/inout/OrderController.java | 15 ++++++++++----- .../sale/admin/entity/basic/UdiInfoEntity.java | 2 ++ .../admin/res/basic/UdiRelevanceResponse.java | 2 ++ .../glxp/sale/admin/thread/UdiDlHttpClient.java | 4 ++++ .../src/main/resources/application-dev.properties | 1 - .../resources/mybatis/mapper/basic/UdiInfoDao.xml | 2 +- .../mybatis/mapper/inout/StockOrderDao.xml | 2 +- 8 files changed, 22 insertions(+), 10 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java index 90949b6..76484f8 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java @@ -143,7 +143,7 @@ public class UdiRelevanceController { } } - filterUdiInfoRequest.setDiType(1); +// filterUdiInfoRequest.setDiType(1); udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest); PageInfo pageInfo; @@ -165,7 +165,7 @@ public class UdiRelevanceController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } List udiRelevanceResponses = null; - filterUdiInfoRequest.setDiType(1); +// filterUdiInfoRequest.setDiType(1); if (filterUdiInfoRequest.getUdiCode() != null && !filterUdiInfoRequest.getUdiCode().isEmpty()) { UdiEntity udiEntity = FilterUdiUtils.getUdi(filterUdiInfoRequest.getUdiCode()); filterUdiInfoRequest.setNameCode(udiEntity.getUdi()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java index fc6e6f7..5cfb2fc 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java @@ -16,11 +16,13 @@ import com.glxp.sale.admin.entity.basic.BussinessTypeEntity; import com.glxp.sale.admin.entity.basic.EntrustReceEntity; import com.glxp.sale.admin.entity.info.CompanyEntity; import com.glxp.sale.admin.entity.inout.*; +import com.glxp.sale.admin.entity.inventory.InvBusUserEntity; import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity; import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; import com.glxp.sale.admin.entity.udid.UdiEntity; import com.glxp.sale.admin.req.basic.BasicEntrustRecRequest; import com.glxp.sale.admin.req.inout.*; +import com.glxp.sale.admin.req.inventory.FilterInvBusUserRequest; import com.glxp.sale.admin.req.inventory.FilterInvUserRequest; import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest; import com.glxp.sale.admin.res.PageSimpleResponse; @@ -31,6 +33,7 @@ import com.glxp.sale.admin.service.basic.BussinessTypeService; import com.glxp.sale.admin.service.basic.EntrustReceService; import com.glxp.sale.admin.service.info.CompanyService; import com.glxp.sale.admin.service.inout.*; +import com.glxp.sale.admin.service.inventory.InvBusUserService; import com.glxp.sale.admin.service.inventory.InvWarehouseService; import com.glxp.sale.admin.service.param.SystemParamConfigService; import com.glxp.sale.admin.thread.InvProductsTrService; @@ -257,6 +260,8 @@ public class OrderController { return ResultVOUtils.success(pageSimpleResponse); } + @Resource + InvBusUserService invBusUserService; //手持终端下载订单校验 @AuthRuleAnnotation("") @@ -281,13 +286,13 @@ public class OrderController { return ResultVOUtils.error(500, "非" + bussinessTypeEntity.getName() + "类型单据！"); } else if (stockOrderEntity.getStatus().equals(ConstantStatus.SORDER_CHECKED)) { if (StrUtil.isNotEmpty(stockOrderEntity.getLocStorageCode())) { - List warehouseUserEntities = new ArrayList<>(); + List warehouseUserEntities = new ArrayList<>(); List invWarehouseEntities = new ArrayList<>(); if (StrUtil.isNotEmpty(stockOrderEntity.getInvWarehouseCode())) { - FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest(); - filterInvUserRequest.setCode(stockOrderEntity.getInvWarehouseCode()); - filterInvUserRequest.setUserid(userId.longValue()); - warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest); + FilterInvBusUserRequest filterInvBusUserRequest = new FilterInvBusUserRequest(); + filterInvBusUserRequest.setSubInvCode(stockOrderEntity.getInvWarehouseCode()); + filterInvBusUserRequest.setUserId(userId + ""); + warehouseUserEntities = invBusUserService.filterInvBusUser(filterInvBusUserRequest); } else { FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest(); filterInvWarehouseRequest.setCode(stockOrderEntity.getLocStorageCode()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiInfoEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiInfoEntity.java index dc7c13e..93694fc 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiInfoEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiInfoEntity.java @@ -66,6 +66,8 @@ public class UdiInfoEntity { private boolean allowNoProduct; private String price; + private String cplx; + private String hchzsb; //产品代理商 private String cpdls; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java index 022786a..275f03f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java @@ -71,6 +71,8 @@ public class UdiRelevanceResponse { private boolean allowNoExpire; private boolean allowNoProduct; private String spmc; + private String cplx; + private String hchzsb; private String price; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/UdiDlHttpClient.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/UdiDlHttpClient.java index a66426f..09ce909 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/UdiDlHttpClient.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/UdiDlHttpClient.java @@ -48,6 +48,8 @@ public class UdiDlHttpClient { BeanUtils.copyProperties(productInfoEntity, udiInfoEntity); udiInfoEntity.setUuid(myUuid); udiInfoEntity.setOriginUuid(productInfoEntity.getUuid()); + udiInfoEntity.setQxlb(productInfoEntity.getCplx()); + udiInfoEntity.setCplb(productInfoEntity.getHchzsb()); udiInfoEntities.add(udiInfoEntity); } return udiInfoEntities; @@ -89,6 +91,8 @@ public class UdiDlHttpClient { for (ProductInfoEntity productInfoEntity : datas) { UdiInfoEntity udiInfoEntity = new UdiInfoEntity(); BeanUtils.copyProperties(productInfoEntity, udiInfoEntity); + udiInfoEntity.setQxlb(productInfoEntity.getCplx()); + udiInfoEntity.setCplb(productInfoEntity.getHchzsb()); udiInfoEntities.add(udiInfoEntity); } return udiInfoEntities; diff --git a/api-admin/src/main/resources/application-dev.properties b/api-admin/src/main/resources/application-dev.properties index eff4fd0..d3db546 100644 --- a/api-admin/src/main/resources/application-dev.properties +++ b/api-admin/src/main/resources/application-dev.properties @@ -3,7 +3,6 @@ server.port=9906 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms_za?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true spring.datasource.username=root -#spring.datasource.password=root spring.datasource.password=123456 spring.datasource.hikari.connection-timeout=60000 spring.datasource.hikari.maximum-pool-size=60 diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml index 799178d..0aff91e 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml @@ -47,7 +47,7 @@ basic_products.scbssfbhxlh, basic_products.scbssfbhscrq, basic_products.scbssfbhsxrq,basic_products.cpms,basic_products.originUuid,basic_products.allowNoBatch, - basic_products.allowNoExpire,basic_products.allowNoProduct,basic_products.spmc + basic_products.allowNoExpire,basic_products.allowNoProduct,basic_products.spmc,basic_products.cplx,basic_products.hchzsb FROM (company_product_relevance inner JOIN basic_udirel ON company_product_relevance.udiRlIdFk = basic_udirel.id) diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml index 3d7d8cd..6538da6 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml @@ -290,7 +290,7 @@ stock_order_detail.spec, stock_order_detail.batchNo, stock_order_detail.productDate, stock_order_detail.expireDate, stock_order_detail.count, stock_order_detail.sweepCount, stock_order_detail.ylqxzcrbarmc,stock_order_detail.manufactory, stock_order_detail.zczbhhzbapzbh, - stock_order_detail.price,inv_warehouse.name locInv,basic_products.spmc, + stock_order_detail.price,inv_warehouse.name locInv,inv_warehouse_sub.name subInv,basic_products.spmc, basic_products.cpms,basic_udirel.measname,auth_dept.`name` deptName FROM stock_order INNER JOIN stock_order_detail on stock_order.id = stock_order_detail.orderIdFk