diff --git a/src/main/java/com/glxp/api/aspect/AuthorizeAspect.java b/src/main/java/com/glxp/api/aspect/AuthorizeAspect.java index c4f1b6e15..4f8e23d29 100644 --- a/src/main/java/com/glxp/api/aspect/AuthorizeAspect.java +++ b/src/main/java/com/glxp/api/aspect/AuthorizeAspect.java @@ -21,6 +21,7 @@ import org.springframework.web.context.request.ServletRequestAttributes; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.lang.reflect.Method; +import java.util.Enumeration; /** * 登录验证 AOP @@ -51,7 +52,17 @@ public class AuthorizeAspect { } HttpServletRequest request = attributes.getRequest(); - String id = request.getHeader("ADMIN_ID"); + Enumeration headerNames = request.getHeaderNames(); + while (headerNames.hasMoreElements()) { + String name = headerNames.nextElement(); + + // 根据头部名称获取相应的值 + String value = request.getHeader(name); + log.info("Header Name: " + name); + log.info("Header Value: " + value); + } + + String id = request.getHeader("ADMINID"); if (StrUtil.isBlank(id)) { String apiKey = request.getHeader("api_key"); String secretKey = request.getHeader("secret_key"); @@ -70,7 +81,7 @@ public class AuthorizeAspect { throw new JsonException(ResultEnum.LOGIN_VERIFY_FALL); } - String token = request.getHeader("ADMIN_TOKEN"); + String token = request.getHeader("ADMINTOKEN"); if (token == null) { throw new JsonException(ResultEnum.LOGIN_VERIFY_FALL); } diff --git a/src/main/java/com/glxp/api/aspect/LogAspect.java b/src/main/java/com/glxp/api/aspect/LogAspect.java index ba83ace79..49bb3b0f9 100644 --- a/src/main/java/com/glxp/api/aspect/LogAspect.java +++ b/src/main/java/com/glxp/api/aspect/LogAspect.java @@ -81,7 +81,7 @@ public class LogAspect { throw new JsonException(ResultEnum.NOT_NETWORK); } HttpServletRequest request = attributes.getRequest(); - String id = request.getHeader("ADMIN_ID"); + String id = request.getHeader("ADMINID"); operLog.setOperName(id); if (e != null) { diff --git a/src/main/java/com/glxp/api/controller/auth/LoginController.java b/src/main/java/com/glxp/api/controller/auth/LoginController.java index 7c8a274c3..109331620 100644 --- a/src/main/java/com/glxp/api/controller/auth/LoginController.java +++ b/src/main/java/com/glxp/api/controller/auth/LoginController.java @@ -287,7 +287,7 @@ public class LoginController extends BaseController { @AuthRuleAnnotation("") @GetMapping("/admin/auth/login/getInv") public BaseResponse getInv(HttpServletRequest request) { - String adminId = request.getHeader("ADMIN_ID"); + String adminId = request.getHeader("ADMINID"); Long id = Long.valueOf(adminId); AuthAdmin authAdmin = authAdminService.findById(id); LoginUserInfoResponse loginUserInfoResponse = new LoginUserInfoResponse(); @@ -309,7 +309,7 @@ public class LoginController extends BaseController { @AuthRuleAnnotation("") @GetMapping("/getInfo") public BaseResponse getUserInfo(HttpServletRequest request) { - String adminId = request.getHeader("ADMIN_ID"); + String adminId = request.getHeader("ADMINID"); Long id = Long.valueOf(adminId); AuthAdmin authAdmin = authAdminService.findById(id); LoginUserInfoResponse loginUserInfoResponse = new LoginUserInfoResponse(); diff --git a/src/main/java/com/glxp/api/controller/basic/BasicDestinyRelController.java b/src/main/java/com/glxp/api/controller/basic/BasicDestinyRelController.java index f7cad89cd..b13106489 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicDestinyRelController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicDestinyRelController.java @@ -207,7 +207,7 @@ public class BasicDestinyRelController { throw new JsonException(ResultEnum.NOT_NETWORK); } HttpServletRequest request = attributes.getRequest(); - String userId = request.getHeader("ADMIN_ID"); + String userId = request.getHeader("ADMINID"); AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId)); return authAdmin.getCustomerId() + ""; } 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 9585a9f77..900fbce90 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java @@ -380,7 +380,7 @@ public class UdiRlSupController extends BaseController { throw new JsonException(ResultEnum.NOT_NETWORK); } HttpServletRequest request = attributes.getRequest(); - String userId = request.getHeader("ADMIN_ID"); + String userId = request.getHeader("ADMINID"); AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId)); return authAdmin.getCustomerId() + ""; } diff --git a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java index 1a3aff473..a61e137b5 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java @@ -107,6 +107,12 @@ public class PurApplyController { } else { purApplyService.update(purApplyEntity); } + if (CollUtil.isNotEmpty(postPurApplyRequest.getSubErpOrders())) { + for (PurApplyDetailEntity purApplyDetailEntity : postPurApplyRequest.getSubErpOrders()) { + purApplyDetailService.insert(purApplyDetailEntity); + } + } + return ResultVOUtils.success("提交成功！"); } diff --git a/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java b/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java index 7ab291daf..96f14afcd 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java @@ -2,6 +2,7 @@ package com.glxp.api.controller.purchase; //领用单 import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; @@ -57,10 +58,7 @@ import com.glxp.api.service.purchase.impl.PurApplyDetailService; import com.glxp.api.service.purchase.impl.PurApplyService; import com.glxp.api.service.purchase.impl.PurOrderDetailService; import com.glxp.api.service.purchase.impl.PurPlanDetailService; -import com.glxp.api.util.CustomUtil; -import com.glxp.api.util.GennerOrderUtils; -import com.glxp.api.util.IntUtil; -import com.glxp.api.util.OrderNoTypeBean; +import com.glxp.api.util.*; import com.glxp.api.util.udi.FilterUdiUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; @@ -137,6 +135,7 @@ public class PurOrderReceiveController extends BaseController { return ResultVOUtils.success("成功"); } + @AuthRuleAnnotation("") @PostMapping("/udiwms/receive/order/update") public BaseResponse updateReceive(@RequestBody PurReceiveEntity purReceiveEntity, BindingResult bindingResult) { @@ -237,6 +236,43 @@ public class PurOrderReceiveController extends BaseController { return ResultVOUtils.success(orderNo); } + + @AuthRuleAnnotation("") + @PostMapping("/udiwms/thrsys/order/repeatAdd") + public BaseResponse repeatAddReceive(@RequestBody AddReceiveDetailRequest addReceiveDetailRequest, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + AuthAdmin authAdmin = getUser(); + PurReceiveEntity purReceiveEntity = addReceiveDetailRequest.getPurReceiveEntity(); + String orderNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.LIN_YONG, "yyyyMMdd")); + purReceiveEntity.setBillNo(orderNo); + purReceiveEntity.setCreateUser(authAdmin.getId() + ""); + purReceiveEntity.setCreateTime(new Date()); + purReceiveEntity.setStatus(1); + purReceiveEntity.setId(IdUtil.getSnowflakeNextId()); + receiveService.insertOrder(purReceiveEntity); + for (AddReceiveDetailRequest.DetaiData detaiData : addReceiveDetailRequest.getDatas()) { + PurReceiveDetailEntity purReceiveDetailEntity = new PurReceiveDetailEntity(); + purReceiveDetailEntity.setOrderIdFk(purReceiveEntity.getBillNo()); + purReceiveDetailEntity.setId(null); + purReceiveDetailEntity.setNameCode(detaiData.getNameCode()); + purReceiveDetailEntity.setExpireDate(detaiData.getExpireDate()); + purReceiveDetailEntity.setProductDate(detaiData.getProductDate()); + purReceiveDetailEntity.setRelIdFk(detaiData.getRelIdFk()); + purReceiveDetailEntity.setBatchNo(detaiData.getBatchNo()); + purReceiveDetailEntity.setPrice(detaiData.getPrice()); + purReceiveDetailEntity.setSupId(detaiData.getSupId()); + purReceiveDetailEntity.setCount(detaiData.getCount()); + receivedetailService.insert(purReceiveDetailEntity); + } + purReceiveEntity.setUpdateTime(new Date()); + receiveService.updateOrder(purReceiveEntity); + addReceiveDetailRequest.setPurReceiveEntity(purReceiveEntity); + return ResultVOUtils.success(purReceiveEntity); + } + + @Resource WarehouseUserService warehouseUserService; @Resource diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java index ae9b6d3f2..25f527a1e 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java @@ -321,7 +321,7 @@ public class SupCertController { throw new JsonException(ResultEnum.NOT_NETWORK); } HttpServletRequest request = attributes.getRequest(); - String userId = request.getHeader("ADMIN_ID"); + String userId = request.getHeader("ADMINID"); AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId)); return authAdmin.getCustomerId() + ""; } diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java b/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java index e6836e322..b55928610 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java @@ -335,7 +335,7 @@ public class SupCompanyController { throw new JsonException(ResultEnum.NOT_NETWORK); } HttpServletRequest request = attributes.getRequest(); - String userId = request.getHeader("ADMIN_ID"); + String userId = request.getHeader("ADMINID"); AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId)); return authAdmin.getCustomerId() + ""; } @@ -346,7 +346,7 @@ public class SupCompanyController { throw new JsonException(ResultEnum.NOT_NETWORK); } HttpServletRequest request = attributes.getRequest(); - String userId = request.getHeader("ADMIN_ID"); + String userId = request.getHeader("ADMINID"); AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId)); return authAdmin; } diff --git a/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java b/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java index 24c9851ab..95b52885e 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java @@ -404,7 +404,7 @@ public class SupManufacturerController { throw new JsonException(ResultEnum.NOT_NETWORK); } HttpServletRequest request = attributes.getRequest(); - String userId = request.getHeader("ADMIN_ID"); + String userId = request.getHeader("ADMINID"); AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId)); return authAdmin.getCustomerId() + ""; } diff --git a/src/main/java/com/glxp/api/controller/purchase/SupProductController.java b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java index e0b8fbd83..8b6990913 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupProductController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java @@ -454,7 +454,7 @@ public class SupProductController { throw new JsonException(ResultEnum.NOT_NETWORK); } HttpServletRequest request = attributes.getRequest(); - String userId = request.getHeader("ADMIN_ID"); + String userId = request.getHeader("ADMINID"); AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId)); return authAdmin.getCustomerId() + ""; } diff --git a/src/main/java/com/glxp/api/req/inout/AddReceiveDetailRequest.java b/src/main/java/com/glxp/api/req/inout/AddReceiveDetailRequest.java index a517d01f8..153000785 100644 --- a/src/main/java/com/glxp/api/req/inout/AddReceiveDetailRequest.java +++ b/src/main/java/com/glxp/api/req/inout/AddReceiveDetailRequest.java @@ -22,6 +22,11 @@ public class AddReceiveDetailRequest { private String productDate; private String nameCode; private BigDecimal price; + + private Long relIdFk; + private Integer count; + + } diff --git a/src/main/java/com/glxp/api/req/purchase/PostPurApplyRequest.java b/src/main/java/com/glxp/api/req/purchase/PostPurApplyRequest.java index a2b1d7926..4046255c7 100644 --- a/src/main/java/com/glxp/api/req/purchase/PostPurApplyRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PostPurApplyRequest.java @@ -14,6 +14,6 @@ public class PostPurApplyRequest { int editStatus; PurApplyEntity purApplyEntity; List purApplyDetailEntities; -// List subErpOrders; + List subErpOrders; } diff --git a/src/main/java/com/glxp/api/service/auth/CustomerService.java b/src/main/java/com/glxp/api/service/auth/CustomerService.java index fe8717a14..fa1c0b0e6 100644 --- a/src/main/java/com/glxp/api/service/auth/CustomerService.java +++ b/src/main/java/com/glxp/api/service/auth/CustomerService.java @@ -40,7 +40,7 @@ public class CustomerService { throw new JsonException(ResultEnum.NOT_NETWORK); } HttpServletRequest request = attributes.getRequest(); - String userId = request.getHeader("ADMIN_ID"); + String userId = request.getHeader("ADMINID"); return Long.parseLong(userId); } @@ -51,7 +51,7 @@ public class CustomerService { throw new JsonException(ResultEnum.NOT_NETWORK); } HttpServletRequest request = attributes.getRequest(); - String userId = request.getHeader("ADMIN_ID"); + String userId = request.getHeader("ADMINID"); return userId; } diff --git a/src/main/java/com/glxp/api/service/basic/UdiProductService.java b/src/main/java/com/glxp/api/service/basic/UdiProductService.java index 8e0758d80..ac7e6396b 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiProductService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiProductService.java @@ -68,4 +68,7 @@ public interface UdiProductService { UdiProductEntity getAllowNoBatch(String nameCode); UdiProductEntity selectUdiByName(String nameCode); + + UdiProductEntity selectMinUdiByUuid(String uuid, Integer diType); + } diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java index 2a99e0226..78cce61c1 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java @@ -196,4 +196,15 @@ public class UdiProductServiceImpl implements UdiProductService { public UdiProductEntity selectUdiByName(String nameCode) { return udiProductDao.selectUdiByName(nameCode); } + + @Override + public UdiProductEntity selectMinUdiByUuid(String uuid, Integer diType) { + FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); + filterUdiRelRequest.setUuid(uuid); + filterUdiRelRequest.setDiType(diType); + List udiProductEntities = udiProductDao.filterUdiInfo(filterUdiRelRequest); + if (CollUtil.isNotEmpty(udiProductEntities)) + return udiProductEntities.get(0); + return null; + } } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java index 9a9ea1fe5..c5131d94f 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.api.service.inv.impl; +import com.glxp.api.util.udi.UdiCalCountUtil; import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -117,11 +118,11 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService filterUdiRelRequest.setPackLevel(udiRelevanceDao.selectPackLevel(obj.getNameCode())); System.out.println(filterUdiRelRequest.getPackLevel()); //查询耗材字典信息 - int a=0; - if (filterUdiRelRequest.getPackLevel()==null){ - a=0; - }else { - a=Integer.parseInt(filterUdiRelRequest.getPackLevel())-1; + int a = 0; + if (filterUdiRelRequest.getPackLevel() == null) { + a = 0; + } else { + a = Integer.parseInt(filterUdiRelRequest.getPackLevel()) - 1; } // UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(0); UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(a); @@ -258,6 +259,8 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService @Resource IoOrderService orderService; + @Resource + UdiCalCountUtil udiCalCountUtil; //-----------------------------------------------------------业务单据打印-----------------------------// @Override @@ -293,12 +296,12 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); filterUdiRelRequest.setId(Long.valueOf(obj.getBindRlFk())); //查询耗材字典信息 - UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(0); +// UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(0); //查询产品信息 - UdiProductEntity udiProductEntity = udiProductService.findByNameCode(filterUdiRelevance.getNameCode()); +// UdiProductEntity udiProductEntity = udiProductService.findByNameCode(filterUdiRelevance.getNameCode()); String udiCode = "#" + obj.getNameCode() + "#" + obj.getProductDate() + "#" + obj.getExpireDate() + - "#" + obj.getBatchNo() + "#" + udiProductEntity.getSerialNo() + "#" + "#"; + "#" + obj.getBatchNo() + "#" + "#" + "#"; udiCode = udiCode.replaceAll("#null", "#"); innerOrderPrintEntity.setUdiCode(udiCode); invInnerOrderPrintDao.insert(innerOrderPrintEntity); diff --git a/src/main/java/com/glxp/api/util/udi/UdiCalCountUtil.java b/src/main/java/com/glxp/api/util/udi/UdiCalCountUtil.java index 632c128a1..b8f02894e 100644 --- a/src/main/java/com/glxp/api/util/udi/UdiCalCountUtil.java +++ b/src/main/java/com/glxp/api/util/udi/UdiCalCountUtil.java @@ -1,8 +1,13 @@ package com.glxp.api.util.udi; +import com.glxp.api.entity.basic.UdiProductEntity; +import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.entity.inout.IoCodeTempEntity; import com.glxp.api.res.basic.UdiRelevanceResponse; +import com.glxp.api.service.basic.UdiProductService; import com.glxp.api.service.basic.UdiRelevanceService; +import com.glxp.api.util.IntUtil; +import org.eclipse.jdt.internal.compiler.ast.NullLiteral; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -12,7 +17,8 @@ public class UdiCalCountUtil { @Resource UdiRelevanceService udiRelevanceService; - + @Resource + UdiProductService udiProductService; public int getActCount(UdiRelevanceResponse udiRelevanceResponse) { @@ -63,5 +69,20 @@ public class UdiCalCountUtil { return count; } + public String getMinDi(Long relId) { + UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(relId); + UdiProductEntity udiProductEntity = null; + if (IntUtil.value(udiRelevanceEntity.getIsUseDy())) { + udiProductEntity = udiProductService.selectMinUdiByUuid(udiRelevanceEntity.getUuid(), 1); + } else { + udiProductEntity = udiProductService.selectMinUdiByUuid(udiRelevanceEntity.getUuid(), 2); + } + if (udiProductEntity != null) { + return udiProductEntity.getNameCode(); + } else + return null; + + } + } diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml index d0468a814..3cb3c55bc 100644 --- a/src/main/resources/application-pro.yml +++ b/src/main/resources/application-pro.yml @@ -32,9 +32,9 @@ spring: ok: http: - connect-timeout: 3000 - read-timeout: 3000 - write-timeout: 3000 + connect-timeout: 30000 + read-timeout: 30000 + write-timeout: 30000 max-idle-connections: 200 keep-alive-duration: 300 diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 02f954967..fb6fb8b36 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -32,9 +32,9 @@ spring: ok: http: - connect-timeout: 3000 - read-timeout: 3000 - write-timeout: 3000 + connect-timeout: 30000 + read-timeout: 30000 + write-timeout: 30000 max-idle-connections: 200 keep-alive-duration: 300 diff --git a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml index 73aab9728..aa404c63e 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml @@ -19,6 +19,9 @@ AND uuid = #{uuid} + + AND diType = #{diType} + AND originUuid = #{originUuid} @@ -913,7 +916,7 @@ @@ -1088,13 +1091,13 @@ @@ -1103,64 +1106,64 @@