From c22266b4dfbe3f338d2dd0bb31b10df1b5c92fb5 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 24 五月 2025 13:54:39 +0800
Subject: [PATCH] 13

---
 src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java |   24 +++++++++++-------------
 1 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
index d492cfa..72b5c6d 100644
--- a/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
@@ -100,7 +100,7 @@
                     }
                     break;
                 case "杞簱-鍑哄簱":
-                    process1 = processZKCK(orderDetls);
+                    process1 = processZKCK(order, orderDetls);
                     List<Object> zkck1 = new ArrayList<>();
                     zkck1.add(process1);
                     //鍙戦�佽姹�
@@ -242,27 +242,25 @@
         return data;
     }
 
-    private Object processZKCK(List<OrderDetl> orderDetls) {
+    private Object processZKCK(Order order, List<OrderDetl> orderDetls) {
         //缁勮瀵硅薄鏁版嵁
         Map<String, Object> data = new HashMap<String, Object>();
         WhsTransBillHeaderVO whsTransBillHeaderVO = new WhsTransBillHeaderVO();
         whsTransBillHeaderVO.setPk_org("FYT");
-        whsTransBillHeaderVO.setCwarehouseid("6101");
+        whsTransBillHeaderVO.setCwarehouseid(order.getItemId() + "");
+        whsTransBillHeaderVO.setCotherbizid(order.getAllotItemId() + "");
+        whsTransBillHeaderVO.setCtrantypeid("4K-Cxx-01");
         WhsTransBillBodyVO whsTransBillBodyVO = null;
         List<WhsTransBillBodyVO> whsTransBillBodyVOS = new ArrayList<>();
         for (OrderDetl orderDetl : orderDetls) {
             whsTransBillBodyVO = new WhsTransBillBodyVO();
             String remark = orderDetl.getRemark();
-            if (!Cools.isEmpty(remark)) {
-                NccSaleXsfhmxWms nccSaleXsfhmxWms = JSONObject.parseObject(remark, NccSaleXsfhmxWms.class);
-                whsTransBillBodyVO.setCsourcetype("4331");
-                whsTransBillBodyVO.setClocationid("610101");
-                whsTransBillBodyVO.setCsourcebillbid(nccSaleXsfhmxWms.getCdeliverybid());
-                whsTransBillBodyVO.setCsourcebillhid(nccSaleXsfhmxWms.getCdeliveryid());
-                whsTransBillBodyVO.setNnum(orderDetl.getQty());
-                whsTransBillBodyVO.setVbatchcode(orderDetl.getBatch());
-                whsTransBillBodyVO.setCmaterialoid(orderDetl.getMatnr());
-            }
+            //if (!Cools.isEmpty(remark)) {
+            //NccSaleXsfhmxWms nccSaleXsfhmxWms = JSONObject.parseObject(remark, NccSaleXsfhmxWms.class);
+            whsTransBillBodyVO.setNnum(orderDetl.getQty());
+            whsTransBillBodyVO.setVfree10(orderDetl.getBatch());
+            whsTransBillBodyVO.setCmaterialoid(orderDetl.getMatnr());
+            //}
             whsTransBillBodyVOS.add(whsTransBillBodyVO);
         }
         data.put("WhsTransBillHeaderVO", whsTransBillHeaderVO);

--
Gitblit v1.9.1