From 9220d57a83cc527cac2a33625fe518b5a03f0def Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 23 五月 2025 10:40:48 +0800
Subject: [PATCH] 接口编写

---
 src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java |   95 ++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 81 insertions(+), 14 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 dcafd85..d492cfa 100644
--- a/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
@@ -67,6 +67,7 @@
         int step = (Cools.isEmpty(order.getStep()) || order.getStep() == 0) ? 0 : order.getStep();
         NcResultMessage response = null;
         Object process1 = null;
+        Object process2 = null;
         try {
             switch (order.getDocType$().toString()) {
                 case "閿�鍞彂璐�":
@@ -99,13 +100,23 @@
                     }
                     break;
                 case "杞簱-鍑哄簱":
-                    process1 = processGENERALOUT(orderDetls);
-                    List<Object> zkck = new ArrayList<>();
-                    zkck.add(process1);
+                    process1 = processZKCK(orderDetls);
+                    List<Object> zkck1 = new ArrayList<>();
+                    zkck1.add(process1);
                     //鍙戦�佽姹�
-                    response = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, generalout, JSONObject.toJSONString(zkck));
+                    response = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, whstrans, JSONObject.toJSONString(zkck1));
                     if (!Cools.isEmpty(response) && response.isSuccess()) {
-                        log.info("杞簱-鍑哄簱response:{}", response);
+                        log.info("杞簱-鍑哄簱1response:{}", response);
+                        step = 1;
+                    }
+
+                    process2 = processGENERALOUT2(orderDetls);
+                    List<Object> zkck2 = new ArrayList<>();
+                    zkck2.add(process2);
+                    //鍙戦�佽姹�
+                    response = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, generalout, JSONObject.toJSONString(zkck2));
+                    if (!Cools.isEmpty(response) && response.isSuccess()) {
+                        log.info("杞簱-鍑哄簱2response:{}", response);
                         step = 10;
                     }
                     break;
@@ -191,12 +202,11 @@
             if (!Cools.isEmpty(remark)) {
                 NccScZkmxbWms nccScZkmxbWms = JSONObject.parseObject(remark, NccScZkmxbWms.class);
                 generalInBodyVO.setCsourcebillbid(nccScZkmxbWms.getCspecialbid());
-                //generalInBodyVO.setCsourcebillhid(nccScZkmxbWms.getCdeliveryid());
+                generalInBodyVO.setCsourcebillhid(nccScZkmxbWms.getCspecialhid());
 
-                //generalInBodyVO.setCmaterialvid(orderDetl.getMatnr());
                 generalInBodyVO.setNnum(orderDetl.getQty());
                 generalInBodyVO.setNshouldnum(orderDetl.getAnfme());
-                generalInBodyVO.setVbatchcode(orderDetl.getBatch());
+                generalInBodyVO.setCsourcetype(nccScZkmxbWms.getZklxbm());
             }
             generalInBodyVOS.add(generalInBodyVO);
         }
@@ -204,8 +214,6 @@
         data.put("GeneralInBodyVO", generalInBodyVOS);
         return data;
     }
-
-
 
 
     private Object processDBDD(List<OrderDetl> orderDetls) {
@@ -234,7 +242,33 @@
         return data;
     }
 
-
+    private Object processZKCK(List<OrderDetl> orderDetls) {
+        //缁勮瀵硅薄鏁版嵁
+        Map<String, Object> data = new HashMap<String, Object>();
+        WhsTransBillHeaderVO whsTransBillHeaderVO = new WhsTransBillHeaderVO();
+        whsTransBillHeaderVO.setPk_org("FYT");
+        whsTransBillHeaderVO.setCwarehouseid("6101");
+        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());
+            }
+            whsTransBillBodyVOS.add(whsTransBillBodyVO);
+        }
+        data.put("WhsTransBillHeaderVO", whsTransBillHeaderVO);
+        data.put("WhsTransBillBodyVO", whsTransBillBodyVOS);
+        return data;
+    }
 
 
     private Object processCGDH(List<OrderDetl> orderDetls) {
@@ -242,7 +276,8 @@
         Map<String, Object> data = new HashMap<String, Object>();
         ic_purchasein_h ic_purchasein_h = new ic_purchasein_h();
         ic_purchasein_h.setPk_org("FYT");
-        ic_purchasein_h.setCwarehouseid("6101");
+        ic_purchasein_h.setCwarehouseid("6301");
+        ic_purchasein_h.setCfanaceorgoid("FYT");
         ic_purchasein_b ic_purchasein_b = null;
         List<ic_purchasein_b> ic_purchasein_bs = new ArrayList<>();
         for (OrderDetl orderDetl : orderDetls) {
@@ -251,11 +286,14 @@
             if (!Cools.isEmpty(remark)) {
                 NccCgCgdhdWms nccCgCgdhdWms = JSONObject.parseObject(remark, NccCgCgdhdWms.class);
                 ic_purchasein_h.setCvendorid(nccCgCgdhdWms.getGysbm());
-                ic_purchasein_h.setCbizid(nccCgCgdhdWms.getDhlxbm());
+                ic_purchasein_h.setCtrantypeid(nccCgCgdhdWms.getDhlxbm());
 
+
+                ic_purchasein_b.setCsourcebillbid(nccCgCgdhdWms.getPkArriveorderB());
+                ic_purchasein_b.setCsourcebillhid(nccCgCgdhdWms.getPkArriveorder());
                 ic_purchasein_b.setCmaterialvid(orderDetl.getMatnr());
                 ic_purchasein_b.setNnum(orderDetl.getQty());
-                //ic_purchasein_b.setNshouldassistnum(orderDetl.getQty());
+                ic_purchasein_b.setCsourcetype(nccCgCgdhdWms.getDhlxbm());
                 ic_purchasein_b.setVbatchcode(orderDetl.getBatch());
             }
             ic_purchasein_bs.add(ic_purchasein_b);
@@ -294,6 +332,35 @@
     }
 
 
+    /**
+     * @param orderDetls
+     * @return
+     */
+    private Object processGENERALOUT2(List<OrderDetl> orderDetls) {
+        //缁勮瀵硅薄鏁版嵁
+        Map<String, Object> data = new HashMap<String, Object>();
+        ic_generalout_h generalout_h = new ic_generalout_h();
+        generalout_h.setPk_org("FYT");
+        generalout_h.setCwarehouseid("6101");
+        ic_generalout_b generalout_b = null;
+        List<ic_generalout_b> ic_purchasein_bs = new ArrayList<>();
+        for (OrderDetl orderDetl : orderDetls) {
+            generalout_b = new ic_generalout_b();
+            String remark = orderDetl.getRemark();
+            if (!Cools.isEmpty(remark)) {
+                NccSaleXsfhmxWms nccSaleXsfhmxWms = JSONObject.parseObject(remark, NccSaleXsfhmxWms.class);
+                generalout_b.setMaterialvid(orderDetl.getMatnr());
+                generalout_b.setNshouldassistnum(orderDetl.getQty());
+                generalout_b.setVbatchcode(orderDetl.getBatch());
+            }
+            ic_purchasein_bs.add(generalout_b);
+        }
+        data.put("ic_generalout_h", generalout_h);
+        data.put("ic_generalout_b", ic_purchasein_bs);
+        return data;
+    }
+
+
     private Boolean reportApiLog(Object data, String docType, String url, String path) {
         String response = "";
         boolean success = false;

--
Gitblit v1.9.1