bug修改，代码备份

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<UdiRelevanceResponse> pageInfo;
@@ -165,7 +165,7 @@ public class UdiRelevanceController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         List<UdiRelevanceResponse> 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());

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<WarehouseUserEntity> warehouseUserEntities = new ArrayList<>();
+                List<InvBusUserEntity> warehouseUserEntities = new ArrayList<>();
                 List<InvWarehouseEntity> invWarehouseEntities = new ArrayList<>();
                 if (StrUtil.isNotEmpty(stockOrderEntity.getInvWarehouseCode())) {
-                    FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest();
+                    FilterInvBusUserRequest filterInvBusUserRequest = new FilterInvBusUserRequest();
-                    filterInvUserRequest.setCode(stockOrderEntity.getInvWarehouseCode());
+                    filterInvBusUserRequest.setSubInvCode(stockOrderEntity.getInvWarehouseCode());
-                    filterInvUserRequest.setUserid(userId.longValue());
+                    filterInvBusUserRequest.setUserId(userId + "");
-                    warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest);
+                    warehouseUserEntities = invBusUserService.filterInvBusUser(filterInvBusUserRequest);
                 } else {
                     FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest();
                     filterInvWarehouseRequest.setCode(stockOrderEntity.getLocStorageCode());

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;

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;
 

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;

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

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)

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