From 2e0d98030100f7c201c50a94073f33c22082f24c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 23 五月 2025 12:43:03 +0800
Subject: [PATCH] 接口编写
---
src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java | 103 ++++++++++++++++++++++++++++++---------------------
1 files changed, 60 insertions(+), 43 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 a522452..d492cfa 100644
--- a/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
@@ -14,6 +14,7 @@
import com.zy.nc.entity.NccCgCgdhdWms;
import com.zy.nc.entity.NccSaleDbddWms;
import com.zy.nc.entity.NccSaleXsfhmxWms;
+import com.zy.nc.entity.NccScZkmxbWms;
import com.zy.nc.util.NcResultMessage;
import com.zy.nc.vo.*;
import lombok.extern.slf4j.Slf4j;
@@ -66,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 "閿�鍞彂璐�":
@@ -98,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;
@@ -188,12 +200,13 @@
generalInBodyVO = new GeneralInBodyVO();
String remark = orderDetl.getRemark();
if (!Cools.isEmpty(remark)) {
- NccSaleXsfhmxWms nccSaleXsfhmxWms = JSONObject.parseObject(remark, NccSaleXsfhmxWms.class);
- generalInBodyVO.setCsourcebillbid(nccSaleXsfhmxWms.getCdeliverybid());
- generalInBodyVO.setCsourcebillhid(nccSaleXsfhmxWms.getCdeliveryid());
+ NccScZkmxbWms nccScZkmxbWms = JSONObject.parseObject(remark, NccScZkmxbWms.class);
+ generalInBodyVO.setCsourcebillbid(nccScZkmxbWms.getCspecialbid());
+ generalInBodyVO.setCsourcebillhid(nccScZkmxbWms.getCspecialhid());
+
generalInBodyVO.setNnum(orderDetl.getQty());
generalInBodyVO.setNshouldnum(orderDetl.getAnfme());
- generalInBodyVO.setVbatchcode(orderDetl.getBatch());
+ generalInBodyVO.setCsourcetype(nccScZkmxbWms.getZklxbm());
}
generalInBodyVOS.add(generalInBodyVO);
}
@@ -202,35 +215,6 @@
return data;
}
-
- private Object processQTRK(List<OrderDetl> orderDetls) {
- //缁勮瀵硅薄鏁版嵁
- Map<String, Object> data = new HashMap<String, Object>();
- GeneralInHeadVO generalInHeadVO = new GeneralInHeadVO();
- generalInHeadVO.setPk_org("FYT");
- generalInHeadVO.setCwarehouseid("6101");
- GeneralInBodyVO generalInBodyVO = null;
- List<GeneralInBodyVO> generalInBodyVOS = new ArrayList<>();
- for (OrderDetl orderDetl : orderDetls) {
- generalInBodyVO = new GeneralInBodyVO();
- String remark = orderDetl.getRemark();
- if (!Cools.isEmpty(remark)) {
- NccSaleXsfhmxWms nccSaleXsfhmxWms = JSONObject.parseObject(remark, NccSaleXsfhmxWms.class);
- generalInBodyVO.setCsourcetype("4331");
- generalInBodyVO.setClocationid("610101");
- generalInBodyVO.setCsourcebillbid(nccSaleXsfhmxWms.getCdeliverybid());
- generalInBodyVO.setCsourcebillhid(nccSaleXsfhmxWms.getCdeliveryid());
- generalInBodyVO.setNnum(orderDetl.getQty());
- generalInBodyVO.setNshouldnum(orderDetl.getAnfme());
- generalInBodyVO.setVbatchcode(orderDetl.getBatch());
- generalInBodyVO.setCmaterialoid(orderDetl.getMatnr());
- }
- generalInBodyVOS.add(generalInBodyVO);
- }
- data.put("GeneralInHeadVO", generalInHeadVO);
- data.put("GeneralInBodyVO", generalInBodyVOS);
- return data;
- }
private Object processDBDD(List<OrderDetl> orderDetls) {
//缁勮瀵硅薄鏁版嵁
@@ -258,8 +242,7 @@
return data;
}
-
- private Object processZK(List<OrderDetl> orderDetls) {
+ private Object processZKCK(List<OrderDetl> orderDetls) {
//缁勮瀵硅薄鏁版嵁
Map<String, Object> data = new HashMap<String, Object>();
WhsTransBillHeaderVO whsTransBillHeaderVO = new WhsTransBillHeaderVO();
@@ -287,12 +270,14 @@
return data;
}
+
private Object processCGDH(List<OrderDetl> orderDetls) {
//缁勮瀵硅薄鏁版嵁
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) {
@@ -301,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);
@@ -344,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