From 322e78c971769c8417810ac0dc4cdad065d40d3f Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期三, 06 五月 2026 16:21:30 +0800
Subject: [PATCH] 入出库结果上报
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 308 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 213 insertions(+), 95 deletions(-)
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 a76ea38..2b52fe3 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -1,22 +1,20 @@
package com.zy.asrs.task.handler;
-import com.alibaba.fastjson.JSON;
+import ch.qos.logback.core.pattern.color.MagentaCompositeConverter;
+import cn.hutool.json.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
-import com.core.common.SnowflakeIdWorker;
-import com.zy.asrs.entity.RequestLog;
-import com.zy.asrs.entity.WaitPakin;
-import com.zy.asrs.entity.WrkDetl;
-import com.zy.asrs.entity.WrkMast;
+import com.core.common.R;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.ErpReportParam;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
-import com.zy.common.model.BillDto;
-import com.zy.common.model.MatnrDto;
-import com.zy.common.service.ErpService;
-import com.zy.common.service.wms.ReplenishDto;
-import com.zy.common.service.wms.Result;
-import com.zy.common.service.wms.WmsService;
+import com.zy.common.utils.HttpHandler;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -25,8 +23,8 @@
import java.util.ArrayList;
import java.util.Date;
+import java.util.Iterator;
import java.util.List;
-import java.util.Optional;
/**
* Created by vincent on 2020/7/6
@@ -48,130 +46,119 @@
@Autowired
private WaitPakinLogService waitPakinLogService;
@Autowired
- private ErpService erpService;
+ private OrderService orderService;
@Autowired
- private SnowflakeIdWorker snowflakeIdWorker;
+ private ConfigService configService;
@Autowired
- private WmsService wmsService;
+ private ApiLogService apiLogService;
+ @Autowired
+ private OrderDetlService orderDetlService;
@Transactional
public ReturnT<String> start(WrkMast wrkMast) {
try {
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ // 淇敼璁㈠崟鐘舵�� 浣滀笟涓� ===>> 宸插畬鎴�
+ if (!Cools.isEmpty(wrkDetls)) {
+ Iterator<WrkDetl> iterator = wrkDetls.iterator();
+ while (iterator.hasNext()) {
+ WrkDetl wrkDetl = iterator.next();
+ if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
+ orderService.checkComplete(wrkDetl.getOrderNo());
+ iterator.remove();
+ }
+ }
+ }
- // 鍏ュ簱
+ // 鍏ュ簱 --------------------------------------------------------------------------------
if (wrkMast.getWrkSts() == 5) {
-
// 鍏ㄦ澘鍏ュ簱
if (wrkMast.getIoType() == 1) {
- String docNum = "PU-" + String.valueOf(snowflakeIdWorker.nextId()).substring(0, 15);
- // 涓婃姤缁檈rp
- List<MatnrDto> matnrDtos = new ArrayList<>();
- List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
- for (WrkDetl wrkDetl : wrkDetls) {
- MatnrDto dto = new MatnrDto();
- dto.setMatnr(wrkDetl.getMatnr());
- dto.setCount(wrkDetl.getAnfme());
- matnrDtos.add(dto);
- }
- List<BillDto> dtos = new ArrayList<>();
- for (MatnrDto dto : matnrDtos) {
- BillDto billDto = new BillDto();
- billDto.setMatnr(dto.getMatnr());
- billDto.setQty(dto.getCount());
- dtos.add(billDto);
- }
- if (!erpService.uploadBill(dtos, 34, docNum)) {
- exceptionHandle("鏃犳硶涓婃姤鑷砮rp[workNo={0}]澶辫触", wrkMast.getWrkNo());
+ // 鍏ュ簱瀹屾垚涓婃姤ERP 鎸夋墭鐩樹笂鎶�
+ if (!reportInToErp(wrkMast)){
+ exceptionHandle("鍏ュ簱涓婃姤ERP澶辫触", wrkMast.getWrkNo());
+ return FAIL;
}
// 鍏ュ簱閫氱煡鍗�
if (!Cools.isEmpty(wrkMast.getBarcode())) {
// 淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。
if (!waitPakinLogService.save(wrkMast.getBarcode())) {
- exceptionHandle("淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。[workNo={0}]澶辫触", wrkMast.getWrkNo());
+// exceptionHandle("淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。[workNo={0}]澶辫触", wrkMast.getWrkNo());
}
// 鍒犻櫎鍏ュ簱閫氱煡妗�
if (!waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()))) {
- exceptionHandle("鍒犻櫎鍏ュ簱閫氱煡妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+// exceptionHandle("鍒犻櫎鍏ュ簱閫氱煡妗workNo={0}]澶辫触", wrkMast.getWrkNo());
}
}
+// // 鎵嬪姩鍏ュ簱鐢熸垚鍗曟嵁 銆� 涓婃姤涓夋柟骞冲彴 銆�
+// if (!Cools.isEmpty(wrkDetls)) {
+// if (!orderService.saveHandlerOrder(Boolean.TRUE, wrkMast, wrkDetls)) {
+// exceptionHandle("鐢熸垚鎵嬪姩鍏ュ簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo());
+// }
+// }
// 鎷ｆ枡鍐嶅叆搴�
} else if (wrkMast.getIoType() == 53) {
- // 闈為攢鍞鍗曞嚭搴擄紝闇�瑕佽ˉ璐у埌骞充粨
- if (!wrkMast.getPdcType().equals("Y")) {
- List<ReplenishDto> replenishDtos = new ArrayList<>();
- List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
- for (WrkDetl wrkDetl : wrkDetls) {
- ReplenishDto param = new ReplenishDto();
- param.setMatnr(wrkDetl.getMatnr());
- param.setCount(wrkDetl.getAnfme());
- replenishDtos.add(param);
- }
- Result result = wmsService.replenish(replenishDtos);
- if (result.getCode() != 200) {
- exceptionHandle("琛ヨ揣鍒板钩浠揫workNo={0}]澶辫触", wrkMast.getWrkNo());
- }
- }
-
+// if (!Cools.isEmpty(wrkDetls)) {
+// if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) {
+// exceptionHandle("鐢熸垚鎵嬪姩鍑哄簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo());
+// }
+// }
}
- // 鍑哄簱
+ // 鍑哄簱 --------------------------------------------------------------------------------
} else if (wrkMast.getWrkSts() == 15) {
- // 闈為攢鍞鍗曞嚭搴擄紝闇�瑕佽ˉ璐у埌骞充粨
- if (Cools.isEmpty(wrkMast.getPdcType()) || !wrkMast.getPdcType().equals("Y")) {
- List<ReplenishDto> replenishDtos = new ArrayList<>();
- List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
- if (!Cools.isEmpty(wrkDetls)) {
- for (WrkDetl wrkDetl : wrkDetls) {
- ReplenishDto param = new ReplenishDto();
- param.setMatnr(wrkDetl.getMatnr());
- param.setCount(wrkDetl.getAnfme());
- replenishDtos.add(param);
- }
- Result result = wmsService.replenish(replenishDtos);
- if (result.getCode() != 200) {
- exceptionHandle("琛ヨ揣鍒板钩浠揫workNo={0}]澶辫触", wrkMast.getWrkNo());
- }
- }
- // 閿�鍞鍗�
- } else {
- if (wrkMast.getIoType() == 101) {
- Double more = Optional.ofNullable(wrkMast.getRefWrkno()).orElse(0.0D);
- List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
- if (more > 0 && !Cools.isEmpty(wrkDetls)) {
- WrkDetl wrkDetl = wrkDetls.get(0);
- ReplenishDto param = new ReplenishDto();
- param.setMatnr(wrkDetl.getMatnr());
- param.setCount(more);
- List<ReplenishDto> replenishDtos = new ArrayList<>();
- replenishDtos.add(param);
- Result result = wmsService.replenish(replenishDtos);
- if (result.getCode() != 200) {
- exceptionHandle("琛ヨ揣鍒板钩浠揫workNo={0}]澶辫触", wrkMast.getWrkNo());
- }
- }
- }
+// if (!Cools.isEmpty(wrkDetls)) {
+// if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) {
+// exceptionHandle("鐢熸垚鎵嬪姩鍑哄簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo());
+// }
+// }
+ if (!reportOutToErp(wrkMast)){
+ exceptionHandle("鍑哄簱涓婃姤ERP澶辫触", wrkMast.getWrkNo());
+ return FAIL;
}
}
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
- if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
+// if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
+// exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+// }
+
+ Date now = new Date();
+ WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkMast.getWrkNo()));
+ WrkMastLog wrkMastLog = new WrkMastLog();
+ wrkMastLog.sync(wrkMast1);
+ wrkMastLog.setModiTime(now);
+ wrkMastLog.setWrkSts(wrkMast1.getWrkSts().intValue());
+ if (!wrkMastLogService.insert(wrkMastLog)){
exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
}
+
// 鍒犻櫎宸ヤ綔涓绘。
if (!wrkMastService.deleteById(wrkMast)) {
exceptionHandle("鍒犻櫎宸ヤ綔涓绘。[workNo={0}]澶辫触", wrkMast.getWrkNo());
}
// 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
- if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
-// exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
- }
+ List<WrkDetl> wrkDetls1 = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
+ wrkDetls1.forEach( wrkDetl -> {
+ WrkDetlLog wrkDetlLog = new WrkDetlLog();
+ wrkDetlLog.sync(wrkDetl);
+ wrkDetlLog.setModiTime(now);
+ if (!wrkDetlLogService.insert(wrkDetlLog)){
+ exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+ }
+ });
+
+// if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
+//// exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+// }
// 鍒犻櫎宸ヤ綔鏄庣粏妗�
if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) {
-// exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+ exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", wrkMast.getWrkNo());
}
} catch (Exception e) {
+ log.error("fail", e);
e.printStackTrace();
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg(e.getMessage());
@@ -179,4 +166,135 @@
return SUCCESS;
}
+ // 鎸夋墭鐩樹笂鎶RP
+ @Transactional
+ public boolean reportInToErp(WrkMast wrkMast) {
+ if (Cools.isEmpty(wrkMast)){
+ return false;
+ }
+ List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
+ if (Cools.isEmpty(wrkDetls)) {
+ return false;
+ }
+ List<ErpReportParam> reportParams = new ArrayList<>();
+ wrkDetls.forEach(wrkDetl -> {
+ WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>()
+ .eq("zpallet", wrkMast.getBarcode())
+ .eq("matnr", wrkDetl.getMatnr()));
+ if (Cools.isEmpty(waitPakin)) {
+ throw new CoolException("鎵樼洏鐮�" + wrkMast.getBarcode() + "鐨勭粍鎵樻暟鎹�" + wrkDetl.getMatnr() + "宸蹭笉瀛樺湪");
+ }
+ ErpReportParam erpReportParam = new ErpReportParam();
+ erpReportParam.setBatch(waitPakin.getBatch()); // 鎵规
+ erpReportParam.setQty(waitPakin.getAnfme().toString()); // 鏈鍏�/鍑烘暟閲�
+ erpReportParam.setLineId(""); // 琛屽唴鐮�
+ erpReportParam.setPlanNo(""); // 璁″垝璺熻釜鍙�
+ erpReportParam.setOrderNo(waitPakin.getOrderNo()); // 璁㈠崟缂栫爜
+ erpReportParam.setWareHouseId(""); // 浠撳簱缂栫爜
+ erpReportParam.setLocId(wrkMast.getLocNo()); // 搴撲綅缂栫爜
+ erpReportParam.setMatNr(waitPakin.getMatnr()); // 鐗╂枡缂栫爜
+ erpReportParam.setPalletId(waitPakin.getZpallet()); // 鎵樼洏鍙�
+
+ reportParams.add(erpReportParam);
+ });
+
+ R result = report(reportParams);
+
+ if (result.get("code").equals("200")){
+ return true;
+ }
+ return false;
+ }
+
+ // 鎸夋墭鐩樹笂鎶RP
+ public boolean reportOutToErp(WrkMast wrkMast) {
+ if (Cools.isEmpty(wrkMast)){
+ return false;
+ }
+ List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq(
+ "wrk_no", wrkMast.getWrkNo()));
+ if (Cools.isEmpty(wrkDetls)) {
+ return false;
+ }
+ List<ErpReportParam> reportParams = new ArrayList<>();
+ for (WrkDetl wrkDetl : wrkDetls) {
+ // 宸ヤ綔妗ｆ槑缁嗘病鏈夎鍗曞彿 鎵嬪姩鍑哄簱 涓嶄笂鎶�
+ if (Cools.isEmpty(wrkDetl.getOrderNo())){
+ return true;
+ }
+ ErpReportParam erpReportParam = new ErpReportParam();
+ erpReportParam.setOrderNo(wrkDetl.getOrderNo());
+ erpReportParam.setPlanNo("");
+ erpReportParam.setLineId("");
+ erpReportParam.setWareHouseId("");
+ erpReportParam.setLocId(wrkMast.getSourceLocNo());
+ erpReportParam.setMatNr(wrkDetl.getMatnr());
+ erpReportParam.setQty(wrkDetl.getAnfme().toString());
+ erpReportParam.setPalletId(wrkDetl.getZpallet());
+ erpReportParam.setBatch(wrkDetl.getBatch());
+
+ reportParams.add(erpReportParam);
+ }
+
+ R report = report(reportParams);
+
+ if (report.get("code").equals("200")){
+ return true;
+ }
+ return false;
+ }
+ // 璋冪敤ERP鎺ュ彛涓婃姤
+ @Transactional
+ public R report(List<ErpReportParam> reportParams) {
+ Config url = configService.selectOne(new EntityWrapper<Config>()
+ .eq("code", "erpurl"));
+ if (Cools.isEmpty(url)) {
+ throw new CoolException("閰嶇疆鍙傛暟寮傚父锛孍RP鍦板潃寮傚父");
+ }
+ Config path = configService.selectOne(new EntityWrapper<Config>()
+ .eq("code", "erpreport"));
+ if (Cools.isEmpty(path)) {
+ throw new CoolException("閰嶇疆鍙傛暟寮傚父锛孍RP涓婃姤璺緞寮傚父");
+ }
+ log.info("WMS--->ERP涓婃姤鍙傛暟:" + JSONObject.toJSONString(reportParams));
+ if (Cools.isEmpty(reportParams)) {
+ return R.error("鍙傛暟涓虹┖");
+ }
+ String response = null;
+ boolean flag = false;
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(url.getValue())
+ .setPath(path.getValue())
+ .setJson(JSONObject.toJSONString(reportParams))
+ .build()
+ .doPost();
+ if (Cools.isEmpty(response)){
+ return R.error("ERP鎺ュ彛鏃犲搷搴�");
+ }
+ JSONObject jsonObject = JSONObject.parseObject(response);
+ Integer code = jsonObject.getInteger("code");
+ if (!Cools.isEmpty(jsonObject) && code == 200) {
+ flag = true;
+ return R.ok("WMS--->ERP涓婃姤鎴愬姛");
+ }else {
+ String msg = jsonObject.getString("msg");
+ return R.error(Cools.isEmpty(msg) ? "WMS--->ERP涓婃姤澶辫触锛侊紒锛�" : msg);
+ }
+ }catch (Exception e) {
+ log.error(e.getMessage(), e);
+ return R.error(e.getMessage());
+ }finally {
+ // 淇濆瓨鏃ュ織
+ apiLogService.save(
+ "WMS--->ERP鍏�/鍑哄簱缁撴灉涓婃姤",
+ url.getValue() + path.getValue(),
+ null,
+ url.getValue(),
+ JSONObject.toJSONString(reportParams),
+ response,
+ flag
+ );
+ }
+ }
}
--
Gitblit v1.9.1