From a2ef24e5d60de082204a53e65bff6705e064c61e Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期三, 18 六月 2025 15:37:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java | 76 +++++++++++++++++++++++++++++++++----
1 files changed, 67 insertions(+), 9 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 507c554..a32b024 100644
--- a/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
@@ -6,14 +6,8 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.DocType;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.entity.StoreType;
-import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.service.OrderService;
-import com.zy.asrs.service.ReportToThirdService;
-import com.zy.asrs.service.StoreTypeService;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.service.*;
import com.zy.nc.SendUtil;
import com.zy.nc.entity.*;
import com.zy.nc.service.NccSaleXsfhmxWmsService;
@@ -36,9 +30,14 @@
@Autowired
private ApiLogService apiLogService;
-
@Autowired
private OrderService orderService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
+ @Autowired
+ private InventoryCheckOrderService inventoryCheckOrderService;
+ @Autowired
+ private InventoryCheckOrderDetlService inventoryCheckOrderDetlService;
@Autowired
private StoreTypeService storeTypeService;
@@ -60,6 +59,9 @@
@Value("${NYNC.saveRefWhsTrans}")
private String saveRefWhsTrans;
+
+ @Value("${NYNC.invcountAdd}")
+ private String invcountAdd;
@Value("${NYNC.purchasein}")
private String purchasein;
@@ -219,6 +221,21 @@
}
}
+ @Override
+ public boolean reportCheckOrder(InventoryCheckOrder checkOrder) {
+ Object process1 = processInvcount(checkOrder);
+ //鍙戦�佽姹�
+ NcResultMessage response = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, invcountAdd, JSONObject.toJSONString(process1));
+ log.info("鐩樼偣鍗時esponse:{}", response);
+ if (!Cools.isEmpty(response) && response.isSuccess()) {
+ log.info("鐩樼偣鍗時esponse:{}", response);
+ return true;
+ } else {
+// remark = response.getMessage() + "--" + response.getErrorStack().substring(0, 100);
+ return false;
+ }
+ }
+
private Object processXSFH(List<OrderDetl> orderDetls, Boolean flag) {
//缁勮瀵硅薄鏁版嵁
Map<String, Object> data = new HashMap<String, Object>();
@@ -296,6 +313,47 @@
return data;
}
+ private Object processInvcount(InventoryCheckOrder checkOrder) {
+ List<InventoryCheckOrderDetl> inventoryCheckOrderDetls = inventoryCheckOrderDetlService.selectList(new EntityWrapper<InventoryCheckOrderDetl>()
+ .eq("order_no", checkOrder.getOrderNo()));
+ if (inventoryCheckOrderDetls.isEmpty()) {
+ throw new CoolException("鐩樼偣鏄庣粏涓嶅瓨鍦�");
+ }
+
+ //缁勮瀵硅薄鏁版嵁
+ Map<String, Object> data = new HashMap<String, Object>();
+
+ //浠撳簱id
+ String cwarehouseid = null;
+ List<InvCountBodyVO> invCountBodyVOList = new ArrayList<>();
+ for (InventoryCheckOrderDetl inventoryCheckOrderDetl : inventoryCheckOrderDetls) {
+ List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>()
+ .eq("matnr", inventoryCheckOrderDetl.getMatnr())
+ .eq("batch", inventoryCheckOrderDetl.getBatch())
+ );
+ if (wrkDetls.isEmpty()) {
+ throw new CoolException("宸ヤ綔妗ｆ槑缁嗕笉瀛樺湪");
+ }
+
+ cwarehouseid = wrkDetls.get(0).getStandby1();
+
+ InvCountBodyVO invCountBodyVO = new InvCountBodyVO();
+ invCountBodyVO.setCmaterialoid(inventoryCheckOrderDetl.getMatnr());
+ invCountBodyVO.setVbatchcode(inventoryCheckOrderDetl.getBatch());
+ invCountBodyVO.setNcountastnum(inventoryCheckOrderDetl.getCheckAnfme());
+ invCountBodyVOList.add(invCountBodyVO);
+ }
+
+ InvCountHeaderVO invCountHeaderVO = new InvCountHeaderVO();
+ invCountHeaderVO.setPk_org("FYT");
+ invCountHeaderVO.setCtrantypeid("4R-01");
+ invCountHeaderVO.setCwarehouseid(cwarehouseid);
+
+ data.put("InvCountHeaderVO", invCountHeaderVO);
+ data.put("InvCountBodyVO", invCountBodyVOList);
+ return data;
+ }
+
private Object processZKRK(List<OrderDetl> orderDetls) {
//缁勮瀵硅薄鏁版嵁
Map<String, Object> data = new HashMap<String, Object>();
--
Gitblit v1.9.1