UDI
/
udi-wms-third-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

长泰字段补齐

Browse Source
scpwxyy
yewj 7 months ago
parent 86a8d49558
commit 7ebf0c1930
1 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File

57
src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
Unescape Escape View File

@ -1668,45 +1668,46 @@ public class CtqyyClient extends CommonHttpClient {
VYpzsPresInfo presInfoEntity = value.get(0);
StringBuilder errorMsg = new StringBuilder();
IoCollectOrder ioCollectOrder = new IoCollectOrder();
ioCollectOrder.setBillNo(presInfoEntity.getRXNO());
ioCollectOrder.setBillNo(presInfoEntity.getPRESCRIBE_NUMBER());
ioCollectOrder.setFromType("HIS系统");
ioCollectOrder.setFromCorp(presInfoEntity.getSICK_ID());
ioCollectOrder.setWorkPlaceCode(udiwmsBasicSkPrescribeRequest.getWorkPlaceCode());
ioCollectOrder.setFromCorpName(presInfoEntity.getPSN_NAME());
Date date = DateUtil.parseDate(presInfoEntity.getSEL_RETN_TIME());
// ioCollectOrder.setFromCorpName(presInfoEntity.getPSN_NAME());
Date date = DateUtil.parseDate(presInfoEntity.getLAY_TIME());
ioCollectOrder.setBillTime(date);
ioCollectOrder.setCreateTime(new Date());
ioCollectOrder.setCreateUser(udiwmsBasicSkPrescribeRequest.getCreateUser());
ioCollectOrder.setBackupOrderRemark1(presInfoEntity.getSTOOUT_NO());
ioCollectOrder.setBackupOrderRemark2(presInfoEntity.getSICK_ID());
ioCollectOrder.setBackupOrderRemark3(presInfoEntity.getPSN_NAME());
ioCollectOrder.setBackupOrderRemark4(presInfoEntity.getPSN_NO());
// ioCollectOrder.setBackupOrderRemark3(presInfoEntity.getPSN_NAME());
// ioCollectOrder.setBackupOrderRemark4(presInfoEntity.getPSN_NO());
ioCollectOrder.setUpdateTime(new Date());
ioCollectOrder.setSplitStatus(0);
ioCollectOrder.setTagStatus(0);
List<IoCollectOrderBiz> bizList = new ArrayList<>();
value.forEach(entity -> {
IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz();
BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectOne(new LambdaQueryWrapper<BasicUdirelEntity>().eq(BasicUdirelEntity::getMainId, entity.getFIXMEDINS_HILIST_ID()));
BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectOne(new LambdaQueryWrapper<BasicUdirelEntity>().eq(BasicUdirelEntity::getMainId, entity.getPHYSIC_CODE()));
if (basicUdirelEntity != null) {
collectOrderBiz.setRelId(basicUdirelEntity.getId());
} else {
errorMsg.append(entity.getFIXMEDINS_HILIST_NAME()).append("字典未对照").append(";");
errorMsg.append(entity.getPHYSIC_NAME()).append("字典未对照").append(";");
}
List<VYpzsPresInfo> vYpzsPresInfos = vYpzsPresInfoMapper.selectList(new LambdaQueryWrapper<VYpzsPresInfo>().eq(VYpzsPresInfo::getPRESCRIBE_NUMBER, entity.getRXNO()).eq(VYpzsPresInfo::getPHYSIC_CODE, entity.getFIXMEDINS_HILIST_ID()));
// List<VYpzsPresInfo> vYpzsPresInfos = vYpzsPresInfoMapper.selectList(new LambdaQueryWrapper<VYpzsPresInfo>().eq(VYpzsPresInfo::getPRESCRIBE_NUMBER, entity.getPRESCRIBE_NUMBER()).eq(VYpzsPresInfo::getPHYSIC_CODE, entity.getPHYSIC_CODE()));
if (CollUtil.isNotEmpty(vYpzsPresInfos)) {
VYpzsPresInfo vYpzsPresInfo = vYpzsPresInfos.get(0);
collectOrderBiz.setGgxh(vYpzsPresInfo.getPACK_SPEC());
collectOrderBiz.setMeasureUnit(vYpzsPresInfo.getPHYSIC_UNIT());
}
collectOrderBiz.setCount(entity.getSEL_RETN_CNT());
collectOrderBiz.setThrCode(entity.getFIXMEDINS_HILIST_ID());
collectOrderBiz.setCpmctymc(entity.getFIXMEDINS_HILIST_NAME());
// if (CollUtil.isNotEmpty(vYpzsPresInfos)) {
// VYpzsPresInfo vYpzsPresInfo = vYpzsPresInfos.get(0);
//
// }
collectOrderBiz.setGgxh(entity.getPACK_SPEC());
collectOrderBiz.setMeasureUnit(entity.getPHYSIC_UNIT());
collectOrderBiz.setCount(IntUtil.value(entity.getLAY_PHYSIC_QUANTITY()));
collectOrderBiz.setThrCode(entity.getPHYSIC_CODE());
collectOrderBiz.setCpmctymc(entity.getPHYSIC_NAME());
collectOrderBiz.setOrderIdFk(ioCollectOrder.getBillNo());
collectOrderBiz.setYbbm(entity.getMED_LIST_CODG());
collectOrderBiz.setRemark1(entity.getFINL_TRNS_PRIC() + "");
collectOrderBiz.setYbbm(entity.getCOUNTRY_CODE());
// collectOrderBiz.setRemark1(entity.get() + "");
collectOrderBiz.setTagStatus(1);
collectOrderBiz.setUnTagCount(0);
@ -1750,9 +1751,9 @@ public class CtqyyClient extends CommonHttpClient {
ioCollectOrder.setFromType("HIS系统");
ioCollectOrder.setFromCorp(presInfoEntity.getSICK_ID());
ioCollectOrder.setWorkPlaceCode(udiwmsBasicSkPrescribeRequest.getWorkPlaceCode());
ioCollectOrder.setFromCorpName(presInfoEntity.getPSN_NAME());
Date date = DateUtil.parseDate(presInfoEntity.getSEL_RETN_TIME());
ioCollectOrder.setBillTime(date);
// ioCollectOrder.setFromCorpName();
// Date date = DateUtil.parseDate(presInfoEntity.get());
ioCollectOrder.setBillTime(presInfoEntity.getKEEP_BOOK_TIME());
ioCollectOrder.setCreateTime(new Date());
ioCollectOrder.setCreateUser(udiwmsBasicSkPrescribeRequest.getCreateUser());
ioCollectOrder.setUpdateTime(new Date());
@ -1761,25 +1762,25 @@ public class CtqyyClient extends CommonHttpClient {
List<IoCollectOrderBiz> bizList = new ArrayList<>();
value.forEach(entity -> {
IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz();
BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectOne(new LambdaQueryWrapper<BasicUdirelEntity>().eq(BasicUdirelEntity::getMainId, entity.getFIXMEDINS_HILIST_ID()));
BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectOne(new LambdaQueryWrapper<BasicUdirelEntity>().eq(BasicUdirelEntity::getMainId, entity.getPHYSIC_CODE()));
if (basicUdirelEntity != null) {
collectOrderBiz.setRelId(basicUdirelEntity.getId());
} else {
errorMsg.append(entity.getFIXMEDINS_HILIST_NAME()).append("字典未对照").append(";");
errorMsg.append(entity.getPHYSIC_NAME()).append("字典未对照").append(";");
}
List<VYpzsPresInfoReturn> vYpzsPresInfoReturns = vYpzsPresInfoReturnMapper.selectList(new LambdaQueryWrapper<VYpzsPresInfoReturn>().eq(VYpzsPresInfoReturn::getAPPLY_NO, entity.getAPPLY_NO()).eq(VYpzsPresInfoReturn::getPHYSIC_CODE, entity.getFIXMEDINS_HILIST_ID()));
List<VYpzsPresInfoReturn> vYpzsPresInfoReturns = vYpzsPresInfoReturnMapper.selectList(new LambdaQueryWrapper<VYpzsPresInfoReturn>().eq(VYpzsPresInfoReturn::getAPPLY_NO, entity.getAPPLY_NO()).eq(VYpzsPresInfoReturn::getPHYSIC_CODE, entity.getPHYSIC_CODE()));
if (CollUtil.isNotEmpty(vYpzsPresInfoReturns)) {
VYpzsPresInfoReturn vYpzsPresInfo = vYpzsPresInfoReturns.get(0);
collectOrderBiz.setGgxh(vYpzsPresInfo.getPHYSIC_SPEC());
collectOrderBiz.setMeasureUnit(vYpzsPresInfo.getPHYSIC_UNIT());
}
collectOrderBiz.setThrCode(entity.getFIXMEDINS_HILIST_ID());
collectOrderBiz.setCpmctymc(entity.getFIXMEDINS_HILIST_NAME());
collectOrderBiz.setThrCode(entity.getPHYSIC_CODE());
collectOrderBiz.setCpmctymc(entity.getPHYSIC_NAME());
// collectOrderBiz.setBatchNo(entity.getBATCH_NUMBER());
collectOrderBiz.setOrderIdFk(ioCollectOrder.getBillNo());
collectOrderBiz.setYbbm(entity.getMED_LIST_CODG());
collectOrderBiz.setCount(entity.getSEL_RETN_CNT());
collectOrderBiz.setYbbm(entity.getFEE_SEQUENCE_NO());
collectOrderBiz.setCount(entity.getQUANTITY());
collectOrderBiz.setTagStatus(1);
collectOrderBiz.setUnTagCount(0);
bizList.add(collectOrderBiz);

Write Preview
Loading…
Cancel
Save