代码备份

src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java

@@ -1601,14 +1601,17 @@ public class CtqyyClient extends CommonHttpClient {
                     }
 
                     VYpzsPresInfo vYpzsPresInfo = vYpzsPresInfoMapper.selectOne(new LambdaQueryWrapper<VYpzsPresInfo>().eq(VYpzsPresInfo::getPRESCRIBE_NUMBER, entity.getRXNO()).eq(VYpzsPresInfo::getPHYSIC_CODE, entity.getFIXMEDINS_HILIST_ID()));
+                    if (vYpzsPresInfo != null) {
+                        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());
-                    collectOrderBiz.setGgxh(vYpzsPresInfo.getPACK_SPEC());
 //                    collectOrderBiz.setBatchNo(entity.getBATCH_NUMBER());
                     collectOrderBiz.setOrderIdFk(ioCollectOrder.getBillNo());
                     collectOrderBiz.setYbbm(entity.getMED_LIST_CODG());
-                    collectOrderBiz.setCount(Integer.parseInt(vYpzsPresInfo.getLAY_PHYSIC_QUANTITY()));
-                    collectOrderBiz.setMeasureUnit(vYpzsPresInfo.getPHYSIC_UNIT());
+
                     collectOrderBiz.setTagStatus(1);
                     collectOrderBiz.setUnTagCount(0);
                     bizList.add(collectOrderBiz);
@@ -1808,7 +1811,6 @@ public class CtqyyClient extends CommonHttpClient {
     }
 
 
-
     public void optionUploadCollectOrder3502(IoCollectOrder ioCollectOrder) {
         List<IoCollectOrderBiz> bizList = ioCollectOrder.getBizList();
         if (CollUtil.isNotEmpty(bizList)) {
@@ -1860,6 +1862,12 @@ public class CtqyyClient extends CommonHttpClient {
         if (CollUtil.isNotEmpty(bizList)) {
             List<CollectOrderBizResponse> collectOrderBizResponseList = ioCollectOrder.getCollectOrderBizResponseList();
             List<Xsth3506Request> xsth3506Requests = new ArrayList<>();
+            List<VInsurNationGoodsReturn> vInsurNationGoodsReturns = vInsurNationGoodsReturnMapper.selectList(new LambdaQueryWrapper<VInsurNationGoodsReturn>().eq(VInsurNationGoodsReturn::getAPPLY_NO, ioCollectOrder.getBillNo()));
+            if (CollUtil.isEmpty(vInsurNationGoodsReturns)) {
+                log.error("申请单号{}不存在", ioCollectOrder.getBillNo());
+                return;
+            }
+
             for (CollectOrderBizResponse collectOrderBizResponse : collectOrderBizResponseList) {
                 BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectById(collectOrderBizResponse.getRelId());
                 String itemCode = basicUdirelEntity.getMainId();