1:东山nginx转发问题(头部参数修改);

2:再次领用;再次申购问题;
3.生成内部码是否以最小使用单元问题
zyy_db
anthonywj 1 year ago
parent c065ed3a6d
commit 0a0155a967

@ -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<String> 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);
}

@ -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) {

@ -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();

@ -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() + "";
}

@ -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() + "";
}

@ -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("提交成功!");
}

@ -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

@ -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() + "";
}

@ -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;
}

@ -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() + "";
}

@ -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() + "";
}

@ -22,6 +22,11 @@ public class AddReceiveDetailRequest {
private String productDate;
private String nameCode;
private BigDecimal price;
private Long relIdFk;
private Integer count;
}

@ -14,6 +14,6 @@ public class PostPurApplyRequest {
int editStatus;
PurApplyEntity purApplyEntity;
List<PurApplyDetailEntity> purApplyDetailEntities;
// List<StockOrderDetailEntity> subErpOrders;
List<PurApplyDetailEntity> subErpOrders;
}

@ -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;
}

@ -68,4 +68,7 @@ public interface UdiProductService {
UdiProductEntity getAllowNoBatch(String nameCode);
UdiProductEntity selectUdiByName(String nameCode);
UdiProductEntity selectMinUdiByUuid(String uuid, Integer diType);
}

@ -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<UdiProductEntity> udiProductEntities = udiProductDao.filterUdiInfo(filterUdiRelRequest);
if (CollUtil.isNotEmpty(udiProductEntities))
return udiProductEntities.get(0);
return null;
}
}

@ -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);

@ -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;
}
}

@ -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

@ -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

@ -19,6 +19,9 @@
<if test="uuid != '' and uuid != null">
AND uuid = #{uuid}
</if>
<if test="diType != null">
AND diType = #{diType}
</if>
<if test="originUuid != '' and originUuid != null">
AND originUuid = #{originUuid}
</if>
@ -913,7 +916,7 @@
<select id="selectGgxhList" resultType="java.lang.String">
select distinct ggxh
from basic_products
left join basic_udirel on basic_products.uuid = basic_udirel.uuid
left join basic_udirel on basic_products.uuid = basic_udirel.uuid
where basic_udirel.id = #{relId}
</select>
@ -1088,13 +1091,13 @@
<select id="selectUdiByName" resultType="com.glxp.api.entity.basic.UdiProductEntity">
SELECT b1.*,
b2.useMuti as useMuti,
b2.useNum as useNum,
b2.id as relId,
c1.customerId as supId
b2.useMuti as useMuti,
b2.useNum as useNum,
b2.id as relId,
c1.customerId as supId
FROM basic_products b1
LEFT JOIN basic_udirel b2 ON b1.uuid = b2.uuid
LEFT JOIN company_product_relevance c1 ON c1.udiRlIdFk = b2.id
LEFT JOIN basic_udirel b2 ON b1.uuid = b2.uuid
LEFT JOIN company_product_relevance c1 ON c1.udiRlIdFk = b2.id
where nameCode = #{nameCode}
limit 1
</select>
@ -1103,64 +1106,64 @@
<select id="filterUdiInfoById" parameterType="string"
resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
SELECT basic_products.id,
basic_udirel.id as relId,
basic_udirel.thirdId,
basic_udirel.isUseDy,
basic_udirel.thirdId1,
basic_udirel.thirdId2,
basic_udirel.thirdId3,
basic_udirel.thirdId4,
basic_udirel.isDisable,
basic_udirel.udplatCode,
basic_products.nameCode,
basic_products.packRatio,
basic_products.packLevel,
basic_products.packUnit,
basic_products.bhxjsl,
basic_products.bhzxxsbzsl,
basic_products.zxxsbzbhsydysl,
basic_products.bhxjcpbm,
basic_products.bzcj,
basic_products.deviceRecordKey,
basic_products.cpmctymc,
basic_products.cplb,
basic_products.flbm,
basic_products.ggxh,
basic_products.qxlb,
basic_products.tyshxydm,
basic_products.ylqxzcrbarmc,
basic_products.zczbhhzbapzbh,
basic_products.ylqxzcrbarywmc,
basic_products.sydycpbs,
basic_products.uuid,
basic_products.sjcpbm,
basic_products.versionNumber,
basic_products.diType,
basic_products.scbssfbhph,
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.allowNoSerial,
basic_products.spmc,
basic_products.sfwblztlcp,
basic_products.cgzmraqxgxx,
basic_products.sfbjwycxsy,
basic_products.zdcfsycs,
basic_products.sfwwjbz,
basic_products.syqsfxyjxmj,
basic_products.mjfs,
basic_products.categoryName,
basic_products.cplx,
basic_products.hchzsb,
company_product_relevance.customerId as unitFk
basic_udirel.id as relId,
basic_udirel.thirdId,
basic_udirel.isUseDy,
basic_udirel.thirdId1,
basic_udirel.thirdId2,
basic_udirel.thirdId3,
basic_udirel.thirdId4,
basic_udirel.isDisable,
basic_udirel.udplatCode,
basic_products.nameCode,
basic_products.packRatio,
basic_products.packLevel,
basic_products.packUnit,
basic_products.bhxjsl,
basic_products.bhzxxsbzsl,
basic_products.zxxsbzbhsydysl,
basic_products.bhxjcpbm,
basic_products.bzcj,
basic_products.deviceRecordKey,
basic_products.cpmctymc,
basic_products.cplb,
basic_products.flbm,
basic_products.ggxh,
basic_products.qxlb,
basic_products.tyshxydm,
basic_products.ylqxzcrbarmc,
basic_products.zczbhhzbapzbh,
basic_products.ylqxzcrbarywmc,
basic_products.sydycpbs,
basic_products.uuid,
basic_products.sjcpbm,
basic_products.versionNumber,
basic_products.diType,
basic_products.scbssfbhph,
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.allowNoSerial,
basic_products.spmc,
basic_products.sfwblztlcp,
basic_products.cgzmraqxgxx,
basic_products.sfbjwycxsy,
basic_products.zdcfsycs,
basic_products.sfwwjbz,
basic_products.syqsfxyjxmj,
basic_products.mjfs,
basic_products.categoryName,
basic_products.cplx,
basic_products.hchzsb,
company_product_relevance.customerId as unitFk
FROM basic_udirel
left JOIN company_product_relevance ON company_product_relevance.udiRlIdFk = basic_udirel.id
left JOIN basic_products ON basic_udirel.uuid = basic_products.uuid
left JOIN company_product_relevance ON company_product_relevance.udiRlIdFk = basic_udirel.id
left JOIN basic_products ON basic_udirel.uuid = basic_products.uuid
<where>
<if test="id != '' and id != null">
AND basic_udirel.id = #{id}

Loading…
Cancel
Save