bug修改

src/main/java/com/glxp/api/controller/BaseController.java

@@ -42,4 +42,12 @@ public class BaseController {
         return authAdmin.getCustomerId() + "";
     }
 
+
+    public boolean isHosUser() {
+        String customerId = getCustomerId();
+        if (customerId.equals("110")) {
+            return true;
+        }
+        return false;
+    }
 }

src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java

@@ -104,7 +104,12 @@ public class InvWarehouseController extends BaseController {
     @AuthRuleAnnotation("")
     @GetMapping("spms/inv/warehouse/findByUser")
     public BaseResponse findByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) {
+
+        if (isHosUser()) {
             filterInvWarehouseRequest.setUserId(getUserId());
+        } else {
+            filterInvWarehouseRequest.setUserId(null);
+        }
         List<InvWarehouseEntity> invSubWarehouseEntities = invWarehouseService.filterGroupInvSub(filterInvWarehouseRequest);
         return ResultVOUtils.success(invSubWarehouseEntities);
     }
@@ -120,7 +125,13 @@ public class InvWarehouseController extends BaseController {
         if (null == userId) {
             return ResultVOUtils.error(ResultEnum.LOGIN_VERIFY_FALL);
         }
+
+        if (isHosUser()) {
             filterInvWarehouseRequest.setUserId(userId);
+        } else {
+            filterInvWarehouseRequest.setUserId(null);
+        }
+
         List<InvWarehouseEntity> list = invWarehouseService.findInvListByUser(filterInvWarehouseRequest);
         return ResultVOUtils.success(list);
     }

src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java

@@ -87,7 +87,11 @@ public class BasicBussinessTypeController extends BaseController {
         if (StrUtil.isEmpty(bussinessTypeFilterRequest.getCode())) {
             return ResultVOUtils.error(500, "仓库编码不能为空！");
         }
+        if (isHosUser()) {
             bussinessTypeFilterRequest.setUserId(getUserId());
+        } else {
+            bussinessTypeFilterRequest.setUserId(null);
+        }
         List<BasicBussinessTypeResponse> bussinessTypeEntities;
         bussinessTypeEntities = basicBussinessTypeService.filterJoinByUser(
                 bussinessTypeFilterRequest);

src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java

@@ -189,8 +189,6 @@ public class BasicOrderPrintController {
         }
 
 
-
-
         data.put("data", list);
         String param = JSON.toJSONString(data);
         JasperUtils.jasperReport(request, response, param, systemPDFTemplateEntity.getPath(), "pdf");

src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java

@@ -28,6 +28,7 @@ import com.glxp.api.service.thrsys.ThrDataService;
 import com.glxp.api.service.thrsys.ThrSystemService;
 import com.glxp.api.util.GennerOrderUtils;
 import com.glxp.api.util.udi.FilterUdiUtils;
+import com.glxp.api.util.udi.UdiInfoUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -305,9 +306,9 @@ public class UdiRelevanceController {
         udiProductEntity.setCpms(udiRelevanceSaveRequest.getCpms());
         udiProductEntity.setPrice(udiRelevanceSaveRequest.getPrice());
         udiProductEntity.setSpmc(udiRelevanceSaveRequest.getSpmc());
-        udiProductEntity.setAllowNoBatch(udiRelevanceSaveRequest.getAllowNoBatch());
+//        udiProductEntity.setAllowNoBatch(udiRelevanceSaveRequest.getAllowNoBatch());
-        udiProductEntity.setAllowNoExpire(udiRelevanceSaveRequest.getAllowNoExpire());
+//        udiProductEntity.setAllowNoExpire(udiRelevanceSaveRequest.getAllowNoExpire());
-        udiProductEntity.setAllowNoProduct(udiRelevanceSaveRequest.getAllowNoProduct());
+//        udiProductEntity.setAllowNoProduct(udiRelevanceSaveRequest.getAllowNoProduct());
         udiProductEntity.setZxxsbzbhsydysl(udiRelevanceEntity.getUseNum());
         udiProductEntity.setBasicPrductRemak1(udiRelevanceSaveRequest.getBasicPrductRemak1());
         udiProductEntity.setBasicPrductRemak2(udiRelevanceSaveRequest.getBasicPrductRemak2());
@@ -317,6 +318,7 @@ public class UdiRelevanceController {
         udiProductEntity.setBasicPrductRemak6(udiRelevanceSaveRequest.getBasicPrductRemak6());
         udiProductEntity.setBasicPrductRemak7(udiRelevanceSaveRequest.getBasicPrductRemak7());
         udiProductEntity.setBasicPrductRemak8(udiRelevanceSaveRequest.getBasicPrductRemak8());
+        udiProductEntity = UdiInfoUtil.initUdiInfoEntity(udiProductEntity);
         if (StrUtil.isNotEmpty(udiRelevanceSaveRequest.getOriginUuid())) {
             udiProductEntity.setProductType(ConstantStatus.PRODUCT_TYPE_UDI);
         }

src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java

@@ -7,6 +7,7 @@ import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.basic.BasicCorpEntity;
 import com.glxp.api.entity.basic.UdiEntity;
@@ -48,7 +49,7 @@ import java.util.List;
  * 供应商关联耗材字典信息
  */
 @RestController
-public class UdiRlSupController {
+public class UdiRlSupController extends BaseController {
     @Resource
     private AuthAdminService authAdminService;
     @Resource
@@ -77,7 +78,8 @@ public class UdiRlSupController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
 
-        if (companyProductRelevanceRequest.getCustomerId().equals("110")) {
+        String customerId = getCustomerId();
+        if (customerId.equals("110")) {
             companyProductRelevanceRequest.setCustomerId(null);
         }
         companyProductRelevanceRequest.setIsDisable(false);

src/main/resources/application-dev.yml

@@ -4,12 +4,12 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_spms_wmd?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
-    password: Glxp@6066
+    password: 123456
     hikari:
       connection-timeout: 60000
-      maximum-pool-size: 60
+      maximum-pool-size: 20
       minimum-idle: 10
 
 

src/main/resources/application-pro.yml

@@ -3,7 +3,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    jdbc-url: jdbc:mysql://192.168.0.66:3364/udi_spms_wmd?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:mysql://127.0.0.1:3306/udi_spms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: Glxp@6066
     hikari:

src/main/resources/application-test.yml

@@ -8,10 +8,10 @@ spring:
     password: Glxp@6066
     hikari:
       connection-timeout: 60000
-      maximum-pool-size: 60
+      maximum-pool-size: 20
       minimum-idle: 10
   redis:
-    database: 8
+    database: 10
     host: 192.168.0.66
     port: 6400
     #    password: 123456
@@ -43,7 +43,7 @@ logging:
   level:
     com.glxp.api.dao: debug
 
-file_path: /usr/local/develop/udi/udiwms/udiwmsfile/
+file_path: D:/udi/udiwms/udiwmsfile/
 UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df
 UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test
 SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs