|
|
|
@ -1832,20 +1832,33 @@ 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()).last(" limit 1"));
|
|
|
|
|
if (basicUdirelEntity != null) {
|
|
|
|
|
collectOrderBiz.setRelId(basicUdirelEntity.getId());
|
|
|
|
|
} else {
|
|
|
|
|
String med_list_codg = entity.getMED_LIST_CODG();
|
|
|
|
|
BasicProductsEntity basicProductsEntity = null;
|
|
|
|
|
if (StrUtil.isNotBlank(med_list_codg)) {
|
|
|
|
|
basicProductsEntity = basicProductsDao.selectOne(new LambdaQueryWrapper<BasicProductsEntity>()
|
|
|
|
|
.eq(BasicProductsEntity::getYbbm, med_list_codg).last(" limit 1"));
|
|
|
|
|
if (basicProductsEntity != null) {
|
|
|
|
|
collectOrderBiz.setGgxh(basicProductsEntity.getGgxh());
|
|
|
|
|
collectOrderBiz.setMeasureUnit(basicProductsEntity.getPackUnit());
|
|
|
|
|
|
|
|
|
|
BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectOne(new LambdaQueryWrapper<BasicUdirelEntity>()
|
|
|
|
|
.eq(BasicUdirelEntity::getUuid, basicProductsEntity.getUuid()).last(" limit 1"));
|
|
|
|
|
if (basicProductsEntity != null) {
|
|
|
|
|
collectOrderBiz.setRelId(basicUdirelEntity.getId());
|
|
|
|
|
collectOrderBiz.setThrCode(basicUdirelEntity.getMainId());
|
|
|
|
|
}else {
|
|
|
|
|
errorMsg.append(entity.getFIXMEDINS_HILIST_NAME()).append("字典未对照").append(";");
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
errorMsg.append(entity.getFIXMEDINS_HILIST_NAME()).append("字典未对照").append(";");
|
|
|
|
|
}
|
|
|
|
|
}else {
|
|
|
|
|
errorMsg.append(entity.getFIXMEDINS_HILIST_NAME()).append("字典未对照").append(";");
|
|
|
|
|
}
|
|
|
|
|
//====================================
|
|
|
|
|
// 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.getCOUNTRY_CODE());
|
|
|
|
|
collectOrderBiz.setCpmctymc(entity.getFIXMEDINS_HILIST_NAME());
|
|
|
|
|
collectOrderBiz.setOrderIdFk(ioCollectOrder.getBillNo());
|
|
|
|
|
collectOrderBiz.setYbbm(entity.getMED_LIST_CODG());
|
|
|
|
|
//====================================
|
|
|
|
|
collectOrderBiz.setTagStatus(1);
|
|
|
|
|
collectOrderBiz.setUnTagCount(0);
|
|
|
|
|