湖里妇幼上传更新

src/main/java/com/glxp/mipsdl/client/hlfyyy/HlfyyyClient.java

@@ -690,29 +690,30 @@ public class HlfyyyClient extends CommonHttpClient {
             zaxzyyOrderRequest.setCorpName(basicCorpEntity.getName());
             LambdaQueryWrapper<VA001> wrapper = new LambdaQueryWrapper();
             wrapper.eq(VA001::getName,basicCorpEntity.getName());
-            wrapper.eq(VA001::getUnitid,"3");
+            wrapper.eq(VA001::getUnittype,"3");
 
             // 补充数据
             va001 = va001Service.getOne(wrapper);
             if(va001!=null){
                 zaxzyyOrderRequest.setCorpId(va001.getUnitid());
             }else {
-                String msg = "查询单据对应的第三方往来单位信息异常";
+                String msg = "查询单据对应的第三方往来单位信息异常111";
                 orderUploadLogService.updateLocalErr(orderEntity, msg);
-                log.error("----单据提交-----" + orderEntity.getBillNo() + msg);
+                log.error("----单据提交111-----"+ basicCorpEntity+"==="+ orderEntity.getBillNo() + msg);
                 return ResultVOUtils.error(500, msg);
             }
 
         } else {
-            String msg = "查询单据对应的第三方往来单位信息异常";
+            String msg = "查询单据对应的第三方往来单位信息异常222";
             orderUploadLogService.updateLocalErr(orderEntity, msg);
-            log.error("----单据提交-----" + orderEntity.getBillNo() + msg);
+            log.error("----单据提交222-----"+ orderEntity+"==="+ orderEntity.getBillNo() + msg);
             return ResultVOUtils.error(500, msg);
         }
 
         //查询仓库信息
         AuthWarehouseEntity warehouseEntity = authWarehouseDao.selectOne(new QueryWrapper<AuthWarehouseEntity>().eq("code", orderEntity.getInvCode()));
         try {
+            //
             zaxzyyOrderRequest.setLocInvCode(warehouseEntity.getThirdId());
             zaxzyyOrderRequest.setLocInvName(warehouseEntity.getName());
             zaxzyyOrderRequest.setLocStorageCode(warehouseEntity.getThirdId());
@@ -775,6 +776,7 @@ public class HlfyyyClient extends CommonHttpClient {
         if(zaxzyyOrderRequest!=null  ){
             zaxzyyOrderHlfyRequest =new ZaxzyyOrderHlfyRequest();
             BeanUtils.copyProperties(zaxzyyOrderRequest,zaxzyyOrderHlfyRequest,"item,items");
+
             List<UdiwmsOrderDetailHlfyRequest> udiwmsOrderDetailHlfyRequestArrayList = new ArrayList<>();
             for (UdiwmsOrderDetailRequest udiwmsOrderDetailRequest : zaxzyyOrderRequest.getItem()) {
                 log.error("udiwmsOrderDetailRequest==="+udiwmsOrderDetailRequest);
@@ -787,6 +789,16 @@ public class HlfyyyClient extends CommonHttpClient {
                 udiwmsOrderDetailHlfyRequest.setPrice(udiwmsOrderDetailRequest.getPrice().toString());
                 udiwmsOrderDetailHlfyRequest.setCount(udiwmsOrderDetailRequest.getCount()+"");
                 udiwmsOrderDetailHlfyRequest.setAllowNoBatch(Boolean.toString(udiwmsOrderDetailRequest.isAllowNoBatch()));
+                if(udiwmsOrderDetailRequest.getCodeList()!=null && udiwmsOrderDetailRequest.getCodeList().size() >0){
+                    List<UdiwmsOrderDetailHlfyRequest.CodeDetailEntity> list = new ArrayList<>();
+                    for (UdiwmsOrderDetailRequest.CodeDetailEntity codeDetailEntity : udiwmsOrderDetailRequest.getCodeList()) {
+                        UdiwmsOrderDetailHlfyRequest.CodeDetailEntity codeDetailEntityNew =
+                                new UdiwmsOrderDetailHlfyRequest.CodeDetailEntity
+                                        (codeDetailEntity.getCode(),codeDetailEntity.getNameCode(),codeDetailEntity.getCount());
+                        list.add(codeDetailEntityNew);
+                    }
+                    udiwmsOrderDetailHlfyRequest.setCodeList(list);
+                }
                 udiwmsOrderDetailHlfyRequestArrayList.add(udiwmsOrderDetailHlfyRequest);
             }
             zaxzyyOrderHlfyRequest.setItem(udiwmsOrderDetailHlfyRequestArrayList);
@@ -1257,7 +1269,7 @@ public class HlfyyyClient extends CommonHttpClient {
 
         LambdaQueryWrapper<VA001> wrapperVa001 = new LambdaQueryWrapper();
         wrapperVa001.eq(VA001::getName,basicProducts.getManufactory());
-        wrapperVa001.eq(VA001::getUnitid,"2");
+        wrapperVa001.eq(VA001::getUnittype,"2");
 
         // 补充数据
         VA001 va001 = va001Service.getOne(wrapperVa001);

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

@@ -146,6 +146,8 @@ public class UdiwmsOrderDetailHlfyRequest {
      */
     private List<CodeDetailEntity> codeList;
 
+
+
     /**
      * 码明细参数
      */
@@ -164,7 +166,7 @@ public class UdiwmsOrderDetailHlfyRequest {
         /**
          * 数量
          */
-        private Integer count;
+        private String count;
 
         public String getCode() {
             return code;
@@ -182,13 +184,32 @@ public class UdiwmsOrderDetailHlfyRequest {
             this.nameCode = nameCode;
         }
 
-        public Integer getCount() {
+        public String getCount() {
             return count;
         }
 
-        public void setCount(Integer count) {
+        public void setCount(String count) {
             this.count = count;
         }
+
+        public CodeDetailEntity(String code, String nameCode, Integer count) {
+            this.code = code;
+            this.nameCode = nameCode;
+            this.count = count+"";
+        }
+
+        public CodeDetailEntity() {
+        }
+
+        @Override
+        public String toString() {
+            return "CodeDetailEntity{" +
+                    "code='" + code + '\'' +
+                    ", nameCode='" + nameCode + '\'' +
+                    ", count=" + count +
+                    '}';
+        }
     }
 
+
 }

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

@@ -192,6 +192,15 @@ public class UdiwmsOrderDetailRequest {
         public void setCount(Integer count) {
             this.count = count;
         }
+
+        @Override
+        public String toString() {
+            return "CodeDetailEntity{" +
+                    "code='" + code + '\'' +
+                    ", nameCode='" + nameCode + '\'' +
+                    ", count=" + count +
+                    '}';
+        }
     }
 
 }

src/main/java/com/glxp/mipsdl/req/zaxyy/ZaxzyyOrderHlfyRequest.java

@@ -18,11 +18,11 @@ public class ZaxzyyOrderHlfyRequest extends UdiwmsOrderHlfyRequest {
     /**
      * 仓库编码
      */
-    private String locStorageCode;
-
-    /**
-     * 仓库名称
-     */
-    private String locStorageName;
+//    private String locStorageCode;
+//
+//    /**
+//     * 仓库名称
+//     */
+//    private String locStorageName;
     private String  physicFlag;
 }