diff --git a/src/main/java/com/glxp/api/controller/BaseController.java b/src/main/java/com/glxp/api/controller/BaseController.java index 7c7984e7..2f21ad28 100644 --- a/src/main/java/com/glxp/api/controller/BaseController.java +++ b/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; + } } diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java index 050c8255..d8cad22c 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -81,9 +81,9 @@ public class InvWarehouseController extends BaseController { @GetMapping("spms/inv/warehouse/findByDeptUser") public BaseResponse findByDept(FilterInvWarehouseRequest filterInvWarehouseRequest) { AuthAdmin authAdmin = getUser(); - if(authAdmin.getCustomerId().equals("110")){ + if (authAdmin.getCustomerId().equals("110")) { filterInvWarehouseRequest.setUserId(authAdmin.getId()); - }else{ + } else { filterInvWarehouseRequest.setUserId(null); } @@ -104,7 +104,12 @@ public class InvWarehouseController extends BaseController { @AuthRuleAnnotation("") @GetMapping("spms/inv/warehouse/findByUser") public BaseResponse findByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) { - filterInvWarehouseRequest.setUserId(getUserId()); + + if (isHosUser()) { + filterInvWarehouseRequest.setUserId(getUserId()); + } else { + filterInvWarehouseRequest.setUserId(null); + } List 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); } - filterInvWarehouseRequest.setUserId(userId); + + if (isHosUser()) { + filterInvWarehouseRequest.setUserId(userId); + } else { + filterInvWarehouseRequest.setUserId(null); + } + List list = invWarehouseService.findInvListByUser(filterInvWarehouseRequest); return ResultVOUtils.success(list); } diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java index 85e0e675..5e1df8f0 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java +++ b/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, "仓库编码不能为空！"); } - bussinessTypeFilterRequest.setUserId(getUserId()); + if (isHosUser()) { + bussinessTypeFilterRequest.setUserId(getUserId()); + } else { + bussinessTypeFilterRequest.setUserId(null); + } List bussinessTypeEntities; bussinessTypeEntities = basicBussinessTypeService.filterJoinByUser( bussinessTypeFilterRequest); diff --git a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java index 18d3df72..80125251 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java @@ -72,20 +72,20 @@ public class BasicOrderPrintController { //校验模板是否正确 @AuthRuleAnnotation("") @PostMapping("/udiwms/pdf/template/inspection/order/file") - public BaseResponse inspectionStockOrderPDFFromTemplateFile(@RequestBody FilterOrderPrintRequest filterOrderPrintRequest){ + public BaseResponse inspectionStockOrderPDFFromTemplateFile(@RequestBody FilterOrderPrintRequest filterOrderPrintRequest) { - SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntityt=systemPDFTemplateRelevanceService.selectModuleldAndAction(filterOrderPrintRequest.getModuleId(),filterOrderPrintRequest.getAction()); - if(systemPDFTemplateRelevanceEntityt!=null){ - SystemPDFTemplateEntity systemPDFTemplateEntity=systemPDFTemplateService.selectById(systemPDFTemplateRelevanceEntityt.getTemplateId()+""); - if (systemPDFTemplateEntity==null){ - return ResultVOUtils.error(999,"所属模板错误！"); - }else{ - return ResultVOUtils.success(systemPDFTemplateEntity.getId()); - } - }else{ - return ResultVOUtils.error(999,"所属模板错误！"); - } + SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntityt = systemPDFTemplateRelevanceService.selectModuleldAndAction(filterOrderPrintRequest.getModuleId(), filterOrderPrintRequest.getAction()); + if (systemPDFTemplateRelevanceEntityt != null) { + SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(systemPDFTemplateRelevanceEntityt.getTemplateId() + ""); + if (systemPDFTemplateEntity == null) { + return ResultVOUtils.error(999, "所属模板错误！"); + } else { + return ResultVOUtils.success(systemPDFTemplateEntity.getId()); + } + } else { + return ResultVOUtils.error(999, "所属模板错误！"); + } } @@ -100,20 +100,20 @@ public class BasicOrderPrintController { SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");//定义新的日期格式 //查询打印格式 - BasicBussinessTypeEntity basicBussinessTypeEntity=basicBussinessTypeService.findByAction(filterOrderPrintRequest.getAction()); + BasicBussinessTypeEntity basicBussinessTypeEntity = basicBussinessTypeService.findByAction(filterOrderPrintRequest.getAction()); //根据批次号打印 - if(basicBussinessTypeEntity.getOrderVisibleType()==0){ + if (basicBussinessTypeEntity.getOrderVisibleType() == 0) { //查询单据表 - FilterOrderRequest filterOrderRequest=new FilterOrderRequest(); + FilterOrderRequest filterOrderRequest = new FilterOrderRequest(); filterOrderRequest.setBillNo(filterOrderPrintRequest.getOrderIdFk()); - IoOrderResponse ioOrderResponse= ioOrderService.filterList(filterOrderRequest).get(0); + IoOrderResponse ioOrderResponse = ioOrderService.filterList(filterOrderRequest).get(0); //查询业务单详情 - List ioOrderDetailBizEntityList=ioOrderDetailBizService.findByOrderId(filterOrderPrintRequest.getOrderIdFk()); + List ioOrderDetailBizEntityList = ioOrderDetailBizService.findByOrderId(filterOrderPrintRequest.getOrderIdFk()); int i = 1; if (ioOrderDetailBizEntityList != null && ioOrderDetailBizEntityList.size() > 0) { for (IoOrderDetailBizEntity obj : ioOrderDetailBizEntityList) { //查询产品表 - UdiProductEntity udiProductEntity=udiProductService.findByUuid(obj.getUuidFk()); + UdiProductEntity udiProductEntity = udiProductService.findByUuid(obj.getUuidFk()); //组装数据 Map bizData = new HashMap<>(); bizData.put("index", i); @@ -131,35 +131,35 @@ public class BasicOrderPrintController { bizData.put("price", obj.getPrice() == null ? '0' : obj.getPrice()); bizData.put("batchNo", obj.getBatchNo() == null ? ' ' : obj.getBatchNo()); // bizData.put("serialNo", udiProductEntity.getSerialNo() == null ? ' ' : udiProductEntity.getSerialNo()); - bizData.put("productDate",obj.getProductDate()); - bizData.put("expireDate", obj.getExpireDate()); - bizData.put("manufactor", obj.getManufacturer()); + bizData.put("productDate", obj.getProductDate()); + bizData.put("expireDate", obj.getExpireDate()); + bizData.put("manufactor", obj.getManufacturer()); // bizData.put("zczbhhzbapzbh",udiProductEntity.getZczbhhzbapzbh() == null ? ' ' : udiProductEntity.getZczbhhzbapzbh()); // bizData.put("ylqxzcrbarmc", udiProductEntity.getYlqxzcrbarmc() == null ? ' ' : udiProductEntity.getYlqxzcrbarmc()); list.add(bizData); i++; } } - }else{ + } else { //查询单据表 - FilterOrderRequest filterOrderRequest=new FilterOrderRequest(); + FilterOrderRequest filterOrderRequest = new FilterOrderRequest(); filterOrderRequest.setBillNo(filterOrderPrintRequest.getOrderIdFk()); - IoOrderResponse ioOrderResponse= ioOrderService.filterList(filterOrderRequest).get(0); + IoOrderResponse ioOrderResponse = ioOrderService.filterList(filterOrderRequest).get(0); //查询扫码单详情 - List ioCodeEntityList=ioCodeService.findByOrderId(filterOrderPrintRequest.getOrderIdFk()); + List ioCodeEntityList = ioCodeService.findByOrderId(filterOrderPrintRequest.getOrderIdFk()); //查询业务单据表 - List ioOrderDetailBizEntityList=ioOrderDetailBizService.findByOrderId(filterOrderPrintRequest.getOrderIdFk()); + List ioOrderDetailBizEntityList = ioOrderDetailBizService.findByOrderId(filterOrderPrintRequest.getOrderIdFk()); int i = 1; if (ioCodeEntityList != null && ioCodeEntityList.size() > 0) { - IoOrderDetailBizEntity ioOrderDetailBizEntity=new IoOrderDetailBizEntity(); + IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity(); for (IoCodeEntity obj : ioCodeEntityList) { //查询业务表 - for(IoOrderDetailBizEntity ioObj:ioOrderDetailBizEntityList){ - if(ioObj.getBatchNo().equals(obj.getBatchNo()) && ioObj.getBindRlFk().equals(obj.getRelId())){ - ioOrderDetailBizEntity=ioObj; + for (IoOrderDetailBizEntity ioObj : ioOrderDetailBizEntityList) { + if (ioObj.getBatchNo().equals(obj.getBatchNo()) && ioObj.getBindRlFk().equals(obj.getRelId())) { + ioOrderDetailBizEntity = ioObj; break; } - } + } //组装数据 Map bizData = new HashMap<>(); bizData.put("index", i); @@ -177,9 +177,9 @@ public class BasicOrderPrintController { bizData.put("price", ioOrderDetailBizEntity.getPrice() == null ? '0' : ioOrderDetailBizEntity.getPrice()); bizData.put("batchNo", ioOrderDetailBizEntity.getBatchNo() == null ? ' ' : ioOrderDetailBizEntity.getBatchNo()); bizData.put("serialNo", obj.getSerialNo() == null ? ' ' : obj.getSerialNo()); - bizData.put("productDate",ioOrderDetailBizEntity.getProductDate()); - bizData.put("expireDate", ioOrderDetailBizEntity.getExpireDate()); - bizData.put("manufactor", ioOrderDetailBizEntity.getManufacturer()); + bizData.put("productDate", ioOrderDetailBizEntity.getProductDate()); + bizData.put("expireDate", ioOrderDetailBizEntity.getExpireDate()); + bizData.put("manufactor", ioOrderDetailBizEntity.getManufacturer()); // bizData.put("zczbhhzbapzbh",udiProductEntity.getZczbhhzbapzbh() == null ? ' ' : udiProductEntity.getZczbhhzbapzbh()); // bizData.put("ylqxzcrbarmc", udiProductEntity.getYlqxzcrbarmc() == null ? ' ' : udiProductEntity.getYlqxzcrbarmc()); list.add(bizData); @@ -189,8 +189,6 @@ public class BasicOrderPrintController { } - - data.put("data", list); String param = JSON.toJSONString(data); JasperUtils.jasperReport(request, response, param, systemPDFTemplateEntity.getPath(), "pdf"); diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index 8a80932f..8f8cd162 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/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.setAllowNoExpire(udiRelevanceSaveRequest.getAllowNoExpire()); - udiProductEntity.setAllowNoProduct(udiRelevanceSaveRequest.getAllowNoProduct()); +// udiProductEntity.setAllowNoBatch(udiRelevanceSaveRequest.getAllowNoBatch()); +// udiProductEntity.setAllowNoExpire(udiRelevanceSaveRequest.getAllowNoExpire()); +// 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); } diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java index 2e5d512c..35dbff6e 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java +++ b/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); @@ -231,7 +233,7 @@ public class UdiRlSupController { return ResultVOUtils.error(500, vailResult); companyProductsRelService.insertCompanyProducts(udiInfoExportRequest); UdiProductEntity udiProductEntity = new UdiProductEntity(); - BeanUtils.copyProperties(udiProductEntity,udiInfoExportRequest.getSupplementRequest()); + BeanUtils.copyProperties(udiProductEntity, udiInfoExportRequest.getSupplementRequest()); udiProductService.insertUdiInfo(udiProductEntity); return ResultVOUtils.success("后台正在导入，请稍后刷新查看！"); } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 22f252a1..1f97c1a8 100644 --- a/src/main/resources/application-dev.yml +++ b/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 diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml index b7509009..6200a0e0 100644 --- a/src/main/resources/application-pro.yml +++ b/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: diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index ea3230ae..55530f54 100644 --- a/src/main/resources/application-test.yml +++ b/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