From e15dd4703f9d8638fda56b17b147ff628b5c2366 Mon Sep 17 00:00:00 2001 From: Junjie <xjj@123> Date: 星期五, 13 六月 2025 20:37:53 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java | 58 +++++++++++++++++++++++++++++ src/main/java/com/zy/asrs/service/ReportToThirdService.java | 3 + src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 7 +++ 3 files changed, 68 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/ReportToThirdService.java b/src/main/java/com/zy/asrs/service/ReportToThirdService.java index c495d54..f7624c4 100644 --- a/src/main/java/com/zy/asrs/service/ReportToThirdService.java +++ b/src/main/java/com/zy/asrs/service/ReportToThirdService.java @@ -9,4 +9,7 @@ public interface ReportToThirdService { void report(Order order, List<OrderDetl> orderDetls, DocType docType) throws Exception; + + void reportTkrk(String batch, Double anfme); + } 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 221dee2..43ffc1c 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; @@ -200,6 +209,18 @@ } + @Override + public void reportTkrk(String batch, Double anfme) { + Object process1 = processTKRK(batch, 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) { //缁勮瀵硅薄鏁版嵁 @@ -240,6 +261,43 @@ return data; } + private Object processTKRK(String batch, Double anfme) { + EntityWrapper<NccXsckmxTkWms> wrapper = new EntityWrapper<>(); + wrapper.like("VBATCHCODE", batch); + NccXsckmxTkWms nccXsckmxTkWms = nccXsckmxTkWmsService.selectOne(wrapper); + if (null == nccXsckmxTkWms) { + throw new CoolException("鏈壘鍒版鏉$爜"); + } + + NccSaleXsfhmxWms nccSaleXsfhmxWms = nccSaleXsfhmxWmsService.selectOne(new EntityWrapper<NccSaleXsfhmxWms>() + .eq("VBILLCODE", nccXsckmxTkWms.getVsourcebillcode())); + 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; + } + private Object processZKRK(List<OrderDetl> orderDetls) { //缁勮瀵硅薄鏁版嵁 Map<String, Object> data = new HashMap<String, Object>(); diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java index dc6f573..0ae0e0e 100644 --- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java @@ -39,6 +39,8 @@ private WaitPakinLogService waitPakinLogService; @Autowired private OrderService orderService; + @Autowired + private ReportToThirdService reportToThirdService; @Transactional public ReturnT<String> start(WrkMast wrkMast) { @@ -67,6 +69,11 @@ if (wrkMast.getIoType() == 1) { // 鍏ュ簱閫氱煡鍗� if (!Cools.isEmpty(wrkMast.getBarcode())) { + WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode())); + if ("Y".equals(waitPakin.getTkFlag())) { + reportToThirdService.reportTkrk(waitPakin.getBatch(), waitPakin.getAnfme()); + } + // 淇濆瓨鍏ュ簱閫氱煡妗e巻鍙叉。 if (!waitPakinLogService.save(wrkMast.getBarcode())) { // exceptionHandle("淇濆瓨鍏ュ簱閫氱煡妗e巻鍙叉。[workNo={0}]澶辫触", wrkMast.getWrkNo()); -- Gitblit v1.9.1