代码调整

dev
wj 2 years ago
parent 43a067bc4b
commit 013a9a3178

@ -70,11 +70,11 @@ public class IoOrderUtilsService {
//扫码明细表生成 //扫码明细表生成
FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest = new FilterCompanyProductRelevanceRequest(); FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest = new FilterCompanyProductRelevanceRequest();
List<IoCodeTempEntity> ioCodeTempEntities = new ArrayList<>(); List<IoCodeTempEntity> ioCodeTempEntities = new ArrayList<>();
for (IoCodeEntity ioCodeTempEntity : ioCodeEntityList) { for (IoCodeEntity ioCodeEntity : ioCodeEntityList) {
IoCodeTempEntity ioCodeTempEntity1 = new IoCodeTempEntity(); IoCodeTempEntity ioCodeTempEntity1 = new IoCodeTempEntity();
//查询物资信息 //查询物资信息
filterCompanyProductRelevanceRequest.setCustomerId(Long.valueOf(platformLinkRespons.getCustomerId())); filterCompanyProductRelevanceRequest.setCustomerId(Long.valueOf(platformLinkRespons.getCustomerId()));
filterCompanyProductRelevanceRequest.setNameCode(ioCodeTempEntity.getNameCode()); filterCompanyProductRelevanceRequest.setNameCode(ioCodeEntity.getNameCode());
List<ioOrderUploadRequest> udiRlSupEntityList = udiRlSupDao.filterCompanyProduct(filterCompanyProductRelevanceRequest); List<ioOrderUploadRequest> udiRlSupEntityList = udiRlSupDao.filterCompanyProduct(filterCompanyProductRelevanceRequest);
if (CollectionUtil.isNotEmpty(udiRlSupEntityList) && udiRlSupEntityList.size() > 1) { if (CollectionUtil.isNotEmpty(udiRlSupEntityList) && udiRlSupEntityList.size() > 1) {
ioCodeTempEntity1.setRelId(null); ioCodeTempEntity1.setRelId(null);
@ -82,23 +82,23 @@ public class IoOrderUtilsService {
} else { } else {
if (CollectionUtil.isNotEmpty(udiRlSupEntityList)) { if (CollectionUtil.isNotEmpty(udiRlSupEntityList)) {
ioCodeTempEntity1.setRelId(udiRlSupEntityList.get(0).getId()); ioCodeTempEntity1.setRelId(udiRlSupEntityList.get(0).getId());
map.put(ioCodeTempEntity.getRelId(), udiRlSupEntityList.get(0)); map.put(ioCodeEntity.getRelId(), udiRlSupEntityList.get(0));
} }
ioCodeTempEntity1.setOrderId(billNO); ioCodeTempEntity1.setOrderId(billNO);
String code = URLDecoder.decode(ioCodeTempEntity.getCode(), StandardCharsets.UTF_8); String code = URLDecoder.decode(ioCodeEntity.getCode(), StandardCharsets.UTF_8);
ioCodeTempEntity1.setCode(code); ioCodeTempEntity1.setCode(code);
ioCodeTempEntity1.setMainAction(ioCodeTempEntity.getMainAction()); ioCodeTempEntity1.setMainAction(ioCodeEntity.getMainAction());
ioCodeTempEntity1.setAction(platformLinkRespons.getTargetAction()); ioCodeTempEntity1.setAction(platformLinkRespons.getTargetAction());
ioCodeTempEntity1.setNameCode(ioCodeTempEntity.getNameCode()); ioCodeTempEntity1.setNameCode(ioCodeEntity.getNameCode());
ioCodeTempEntity1.setBatchNo(ioCodeTempEntity.getBatchNo()); ioCodeTempEntity1.setBatchNo(ioCodeEntity.getBatchNo());
ioCodeTempEntity1.setProduceDate(ioCodeTempEntity.getProduceDate()); ioCodeTempEntity1.setProduceDate(ioCodeEntity.getProduceDate());
ioCodeTempEntity1.setExpireDate(ioCodeTempEntity.getExpireDate()); ioCodeTempEntity1.setExpireDate(ioCodeEntity.getExpireDate());
ioCodeTempEntity1.setSerialNo(ioCodeTempEntity.getSerialNo()); ioCodeTempEntity1.setSerialNo(ioCodeEntity.getSerialNo());
ioCodeTempEntity1.setPackageLevel(ioCodeTempEntity.getPackageLevel()); ioCodeTempEntity1.setPackageLevel(ioCodeEntity.getPackageLevel());
ioCodeTempEntity1.setSupId(ioCodeTempEntity.getSupId()); ioCodeTempEntity1.setSupId(ioCodeEntity.getSupId());
ioCodeTempEntity1.setCount(ioCodeTempEntity.getCount()); ioCodeTempEntity1.setCount(ioCodeEntity.getCount());
ioCodeTempEntity1.setReCount(ioCodeTempEntity.getReCount()); ioCodeTempEntity1.setReCount(ioCodeEntity.getReCount());
ioCodeTempEntity1.setDeptCode(platformLinkRespons.getInvCode()); ioCodeTempEntity1.setDeptCode(platformLinkRespons.getInvCode());
ioCodeTempEntity1.setInvCode(platformLinkRespons.getInvSubCode()); ioCodeTempEntity1.setInvCode(platformLinkRespons.getInvSubCode());
ioCodeTempEntity1.setUpdateTime(new Date()); ioCodeTempEntity1.setUpdateTime(new Date());

Loading…
Cancel
Save