From b85ee8f8faf8db4669a61a72c855baf4cb2a6482 Mon Sep 17 00:00:00 2001
From: ytfl <ytfl@qq.com>
Date: 星期六, 14 六月 2025 14:19:06 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java | 89 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 76 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 101437c..2174899 100644
--- a/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
@@ -5,6 +5,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
+import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Order;
@@ -16,7 +17,9 @@
import com.zy.asrs.service.StoreTypeService;
import com.zy.nc.SendUtil;
import com.zy.nc.entity.*;
+import com.zy.nc.service.NccSaleXsfhmxWmsService;
import com.zy.nc.service.NccScPcdaWmsService;
+import com.zy.nc.service.NccXsckmxTkWmsService;
import com.zy.nc.util.NcResultMessage;
import com.zy.nc.vo.*;
import lombok.extern.slf4j.Slf4j;
@@ -44,6 +47,12 @@
@Autowired
private NccScPcdaWmsService nccScPcdaWmsService;
+
+ @Autowired
+ private NccXsckmxTkWmsService nccXsckmxTkWmsService;
+
+ @Autowired
+ private NccSaleXsfhmxWmsService nccSaleXsfhmxWmsService;
@Value("${NYNC.ip}")
private String nyncIp;
@@ -114,17 +123,19 @@
}
break;
case "閲囪喘鍒拌揣":
- process1 = processCGDH(orderDetls);
- List<Object> cg = new ArrayList<>();
- cg.add(process1);
- //鍙戦�佽姹�
- response = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, purchasein, JSONObject.toJSONString(cg));
- if (!Cools.isEmpty(response) && response.isSuccess()) {
- log.info("閲囪喘鍒拌揣response:{}", response);
- step = 10;
- } else {
- remark = response.getMessage() + "--" + response.getErrorStack().substring(0, 100);
- }
+ //涓嶉渶瑕佷笂鎶ヤ簡
+ step = 10;
+// process1 = processCGDH(orderDetls);
+// List<Object> cg = new ArrayList<>();
+// cg.add(process1);
+// //鍙戦�佽姹�
+// response = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, purchasein, JSONObject.toJSONString(cg));
+// if (!Cools.isEmpty(response) && response.isSuccess()) {
+// log.info("閲囪喘鍒拌揣response:{}", response);
+// step = 10;
+// } else {
+// remark = response.getMessage() + "--" + response.getErrorStack().substring(0, 100);
+// }
break;
case "杞簱-鍑哄簱":
if (step == 1) {
@@ -198,6 +209,18 @@
}
+ @Override
+ public void reportTkrk(String batch, String orderNo, Double anfme) {
+ Object process1 = processTKRK(batch, orderNo, anfme);
+ //鍙戦�佽姹�
+ NcResultMessage response = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, saveRefDelivery, JSONObject.toJSONString(process1));
+ log.info("閿�鍞彂璐esponse:{}", response);
+// if (!Cools.isEmpty(response) && response.isSuccess()) {
+// log.info("閿�鍞彂璐esponse:{}", response);
+// } else {
+// remark = response.getMessage() + "--" + response.getErrorStack().substring(0, 100);
+// }
+ }
private Object processXSFH(List<OrderDetl> orderDetls, Boolean flag) {
//缁勮瀵硅薄鏁版嵁
@@ -233,6 +256,45 @@
saleOutBodyVO.setNnum(flag ? -orderDetl.getQty() : orderDetl.getQty());
saleOutBodyVOList.add(saleOutBodyVO);
}
+ data.put("SaleOutHeadVO", saleOutHeadVO);
+ data.put("SaleOutBodyVO", saleOutBodyVOList);
+ return data;
+ }
+
+ private Object processTKRK(String batch, String orderNo, Double anfme) {
+ EntityWrapper<NccXsckmxTkWms> wrapper = new EntityWrapper<>();
+ wrapper.eq("VBATCHCODE", batch).eq("VSOURCEBILLCODE", orderNo);
+ NccXsckmxTkWms nccXsckmxTkWms = nccXsckmxTkWmsService.selectOne(wrapper);
+ if (null == nccXsckmxTkWms) {
+ throw new CoolException("鏈壘鍒版鏉＄爜");
+ }
+
+ NccSaleXsfhmxWms nccSaleXsfhmxWms = nccSaleXsfhmxWmsService.selectOne(new EntityWrapper<NccSaleXsfhmxWms>()
+ .eq("VBILLCODE", nccXsckmxTkWms.getVsourcebillcode())
+ .eq("WLBM", nccXsckmxTkWms.getWlbm())
+ );
+ if(null == nccSaleXsfhmxWms) {
+ throw new CoolException("鏈壘鍒伴攢鍞崟鎹�");
+ }
+
+ //缁勮瀵硅薄鏁版嵁
+ Map<String, Object> data = new HashMap<String, Object>();
+ SaleOutHeadVO saleOutHeadVO = new SaleOutHeadVO();
+ saleOutHeadVO.setPk_org("FYT");
+ SaleOutBodyVO saleOutBodyVO = null;
+ List<SaleOutBodyVO> saleOutBodyVOList = new ArrayList<>();
+
+ saleOutBodyVO = new SaleOutBodyVO();
+ saleOutBodyVO.setCsourcetype("4331");
+ saleOutBodyVO.setCsourcebillbid(nccXsckmxTkWms.getCsourcebillbid());
+ saleOutBodyVO.setCsourcebillhid(nccXsckmxTkWms.getCsourcebillhid());
+ saleOutHeadVO.setCwarehouseid(nccSaleXsfhmxWms.getFhckbm());
+
+ saleOutBodyVO.setVbatchcode(nccXsckmxTkWms.getVbatchcode());
+ saleOutBodyVO.setNshouldnum(anfme * -1);
+ saleOutBodyVO.setNnum(anfme * -1);
+ saleOutBodyVOList.add(saleOutBodyVO);
+
data.put("SaleOutHeadVO", saleOutHeadVO);
data.put("SaleOutBodyVO", saleOutBodyVOList);
return data;
@@ -345,7 +407,7 @@
}
whsTransBillBodyVO = new WhsTransBillBodyVO();
- whsTransBillBodyVO.setCstateid(nccScPcdaWms.getVcode());
+ whsTransBillBodyVO.setCstateid(nccScPcdaWms.getPkBatchcode());
String remark = orderDetl.getRemark();
//if (!Cools.isEmpty(remark)) {
@@ -403,7 +465,8 @@
generalout_b.setCotherwhid(rukucangku);
generalout_b.setCothercalbodyvid(storeType2.getDepartmentId());
- generalout_b.setNshouldassistnum(orderDetl.getQty());
+ //generalout_b.setNshouldassistnum(orderDetl.getQty());
+ generalout_b.setNnum(orderDetl.getQty());
generalout_b.setVbatchcode(orderDetl.getBatch());
ic_purchasein_bs.add(generalout_b);
}
--
Gitblit v1.9.1