长泰普耗物资字典新增

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

@@ -256,8 +256,14 @@ public class CtqyyClient extends CommonHttpClient {
             materialDictEntity.setOperatType("2");
         materialDictEntity.setMaterialName(udiRelevanceResponse.getCpmctymc());
         materialDictEntity.setCostlySign("1");
+        if (udiRelevanceResponse.getMainId().endsWith("x")) {
+            materialDictEntity.setMaterialMasterCode(null);
+            materialDictEntity.setHisMaterialCode(null);
+        } else {
             materialDictEntity.setMaterialMasterCode(udiRelevanceResponse.getNameCode());
             materialDictEntity.setHisMaterialCode(udiRelevanceResponse.getMainId());
+        }
+
         materialDictEntity.setMaterialSpec(udiRelevanceResponse.getGgxh());
         materialDictEntity.setMaterialUnit(udiRelevanceResponse.getMeasname());
         //暂无区分进货价，零售价
@@ -573,9 +579,8 @@ public class CtqyyClient extends CommonHttpClient {
         String errMsg = setOrderDetailList(ioCodeEntities, items, detailBizEntities);
         zaxzyyOrderRequest.setItem(items);
         if (CollUtil.isEmpty(items)) {
-            String msg = "查询第三方系统仓库信息异常";
+            orderUploadLogService.updateLocalErr(orderEntity, errMsg);
-            orderUploadLogService.updateLocalErr(orderEntity, msg);
+            return ResultVOUtils.error(500, errMsg);
-            return ResultVOUtils.error(500, msg);
         }
 
         if (StrUtil.isNotEmpty(errMsg)) {
@@ -1060,7 +1065,7 @@ public class CtqyyClient extends CommonHttpClient {
                     submitOrderUtil.setCodeList(ioCodeEntities, detailBizEntity, item);
                     orderDetailRequests.add(item);
                 } else {
-                    errMsg = detailBizEntity.getCoName() + ",";
+                    errMsg = detailBizEntity.getCoName() + "," + "第三方产品编码未关联";
                 }
             }
         }
@@ -1232,13 +1237,22 @@ public class CtqyyClient extends CommonHttpClient {
                             }
                             String code = codeDetaiEntity.getCode();
                             if (code.contains("\u001D")) {
-//                                code = code.replace("\u001D", "zysoft");
+//                                code = code.replace("\u001D", "zysoft");  智业无法识别GS1符号
                                 code = code.replace("\u001D", "");
                             }
                             itemDTO.setCode(code);
-                            itemDTO.setCount(codeDetaiEntity.getCount());
                             itemDTO.setNameCode(codeDetaiEntity.getNameCode());
+
+                            if (IntUtil.value(codeDetaiEntity.getCount()) > 1) {
+                                for (int i = 0; i < codeDetaiEntity.getCount(); i++) {
+                                    itemDTO.setCount(1);
+                                    itemDTOS.add(itemDTO);
+                                }
+                            } else {
+                                itemDTO.setCount(codeDetaiEntity.getCount());
                                 itemDTOS.add(itemDTO);
+                            }
+
 
                         }
                     }

src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java

@@ -480,6 +480,7 @@ public class PtxhyyClient extends CommonHttpClient {
 
             if (CollUtil.isNotEmpty(ptxhInvResponses)) {
                 for (PtxhInvResponse ptxhInvResponse : ptxhInvResponses) {
+
                     ThrInvResultResponse thrInvResultResponse = new ThrInvResultResponse();
                     thrInvResultResponse.setBillType("SC71021292871198");       //科室收费出库
                     thrInvResultResponse.setMainAction(ConstantType.TYPE_OUT);
@@ -487,6 +488,7 @@ public class PtxhyyClient extends CommonHttpClient {
                     List<ThrInvWarehouseEntity> thrInvWarehouseEntitys = thrInvWarehouseDao.selectList(new QueryWrapper<ThrInvWarehouseEntity>().eq("name", ptxhInvResponse.getZxks()));
                     if (CollUtil.isNotEmpty(thrInvWarehouseEntitys)) {
                         for (ThrInvWarehouseEntity thrInvWarehouseEntity : thrInvWarehouseEntitys) {
+
                             AuthWarehouseEntity authWarehouseEntity = authWarehouseDao.selectOne(new QueryWrapper<AuthWarehouseEntity>().eq("thirdId", thrInvWarehouseEntity.getCode()).last("limit 1"));
                             if (authWarehouseEntity != null) {
                                 thrInvResultResponse.setInvCode(authWarehouseEntity.getCode());
@@ -532,7 +534,6 @@ public class PtxhyyClient extends CommonHttpClient {
                     } else {
                         log.error(ptxhInvResponse.getZxks() + "第三方科室仓库未创建！");
                     }
-
                 }
             }