长泰接口修改；平潭核算分类修改

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

@@ -548,19 +548,16 @@ public class CtqyyClient extends CommonHttpClient {
 
             if (vailHightMaterial(detailBizEntities.get(0))) {
                 zaZyRequest.setMsgHeader(getMsgHeader("saveMaterialHight"));
+                UdiwmsPreInOrderRequest udiwmsPreInOrderRequest = submitPreInOrderToThirdSys(zaxzyyOrderRequest, orderEntity);
+                zaZyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsPreInOrderRequest));
             } else {
                 zaZyRequest.setMsgHeader(getMsgHeader("saveMasterialInput"));
+                zaZyRequest.setMsgBody(JSONUtil.toJsonStr(zaxzyyOrderRequest));
             }
 
-            String key = "orderSubmitUrl";
+
-            zaZyRequest.setMsgBody(JSONUtil.toJsonStr(zaxzyyOrderRequest));
         } else if (thrSystemBusApiEntity.getUrl().equals("saveMaterialHight")) {
-//            zaxzyyOrderRequest.setLocStorageCode("1001304");
-//            zaxzyyOrderRequest.setLocStorageName("骨科耗材及试剂仓库");
-            //临床出库
             zaZyRequest.setMsgHeader(getMsgHeader("saveMaterialHight"));
-            String key = "preInOrderSubmit";
-
             UdiwmsPreInOrderRequest udiwmsPreInOrderRequest = submitPreInOrderToThirdSys(zaxzyyOrderRequest, orderEntity);
             zaZyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsPreInOrderRequest));
         }

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

@@ -253,8 +253,8 @@ public class PtxhyyClient extends CommonHttpClient {
                     fprq = DateUtil.formatDateTime(invoiceList.get(0).getInvoiceDate());
             }
             String hsfl = "";
-            if (StrUtil.isNotEmpty(i.getCplb())) {
+            if (StrUtil.isNotEmpty(i.getHslb())) {
-                ThrHslbEntity thrHslbEntity = thrHslbService.getOne(new QueryWrapper<ThrHslbEntity>().eq("hslb", i.getCplb()), false);
+                ThrHslbEntity thrHslbEntity = thrHslbService.getOne(new QueryWrapper<ThrHslbEntity>().eq("hslb", i.getHslb()), false);
                 if (thrHslbEntity != null) {
                     hsfl = thrHslbEntity.getHsbm();
                 }
@@ -272,7 +272,7 @@ public class PtxhyyClient extends CommonHttpClient {
                     .lsjg(i.getPrice() + "")
                     .lsje(wzje)
                     .wzje(wzje + "")
-                    .hsfl(i.getCplb())
+                    .hsfl(i.getHslb())
 //                    .hsfl(hsfl)
                     .wzph(i.getBatchNo())
                     .fphm(fphm)

src/main/java/com/glxp/mipsdl/req/base/UdiwmsOrderDetailRequest.java

@@ -140,6 +140,7 @@ public class UdiwmsOrderDetailRequest {
 
     private String cplb;
     private String diCode;
+    private String hslb;
 
     /**
      * 码明细

src/main/java/com/glxp/mipsdl/req/base/UdiwmsOrderRequest.java

@@ -64,5 +64,9 @@ public class UdiwmsOrderRequest {
      * 单据详情数组
      */
     private List<UdiwmsOrderDetailRequest> item;
+    /**
+     * 单据详情数组
+     */
+    private List<UdiwmsOrderDetailRequest> items;
 
 }

src/main/java/com/glxp/mipsdl/util/SubmitOrderUtil.java

@@ -133,6 +133,7 @@ public class SubmitOrderUtil {
         item.setManufactoryCode(thrProductsEntity.getManufactoryCode());
         item.setSupCode(thrProductsEntity.getSupCode());
         item.setCplb(thrProductsEntity.getFlbm());
+        item.setHslb(thrProductsEntity.getCplb());
         item.setCount(detailBizEntity.getCount());
         return item;
     }