From a68f64232c3f3ad22d27f9b5c89fe761c8a56280 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 28 四月 2026 13:16:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 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 dc6f573..87508d1 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -1,8 +1,10 @@
package com.zy.asrs.task.handler;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.alibaba.fastjson.JSONObject;
import com.core.common.Cools;
import com.zy.asrs.entity.WaitPakin;
+import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.*;
@@ -17,6 +19,7 @@
import java.util.Iterator;
import java.util.List;
+import java.util.Objects;
/**
* Created by vincent on 2020/7/6
@@ -39,6 +42,10 @@
private WaitPakinLogService waitPakinLogService;
@Autowired
private OrderService orderService;
+ @Autowired
+ private ErpTokenService erpTokenService;
+ @Autowired
+ private LocDetlService locDetlService;
@Transactional
public ReturnT<String> start(WrkMast wrkMast) {
@@ -67,6 +74,23 @@
if (wrkMast.getIoType() == 1) {
// 鍏ュ簱閫氱煡鍗�
if (!Cools.isEmpty(wrkMast.getBarcode())) {
+// JSONObject res = erpTokenService.stockIn(wrkMast.getBarcode());
+// if (res != null && Boolean.TRUE.equals(res.getBoolean("success"))) {
+// JSONObject data = res.getJSONObject("data");
+// String tlocation = data == null ? null : data.getString("tlocation");
+// if (!Cools.isEmpty(tlocation) && !Cools.isEmpty(wrkMast.getLocNo())) {
+// List<LocDetl> detls = locDetlService.selectList(new EntityWrapper<LocDetl>()
+// .eq("loc_no", wrkMast.getLocNo()));
+// if (!Cools.isEmpty(detls)) {
+// for (LocDetl detl : detls) {
+// detl.setStandby1(tlocation);
+// locDetlService.updateById(detl);
+// }
+// }
+// }
+// }
+
+
// 淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。
if (!waitPakinLogService.save(wrkMast.getBarcode())) {
// exceptionHandle("淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。[workNo={0}]澶辫触", wrkMast.getWrkNo());
@@ -93,6 +117,23 @@
// 鍑哄簱 --------------------------------------------------------------------------------
} else if (wrkMast.getWrkSts() == 15) {
+ if(wrkMast.getIsSuplus()!=null && wrkMast.getIsSuplus()==1 && !Objects.isNull(wrkMast.getExitMk())){
+ List<WrkDetl> wrkDetls1 = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ WrkDetl wrkDetl = wrkDetls1.get(0);
+ JSONObject res = erpTokenService.stockBack(wrkMast.getBarcode(),wrkDetl.getAnfme(),null);
+ if (res != null && Boolean.TRUE.equals(res.getBoolean("success"))) {
+
+ }
+ }else if(Objects.isNull(wrkMast.getLocNo())){
+ JSONObject res = erpTokenService.stockOut(wrkMast.getBarcode(),null);
+ if (res != null && Boolean.TRUE.equals(res.getBoolean("success"))) {
+
+ }
+ }
+
+// if (!Objects.isNull(wrkMast.getWrkCode())) {
+// return FAIL;
+// }
// if (!Cools.isEmpty(wrkDetls)) {
// if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) {
// exceptionHandle("鐢熸垚鎵嬪姩鍑哄簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo());
--
Gitblit v1.9.1