From 60af4db0b445edbb2856f9bc7199a3e627d32db2 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 13 八月 2025 11:11:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs2' into xgmFlasrs2
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 3 +++
src/main/java/com/zy/asrs/controller/OpenController.java | 3 +++
src/main/java/com/zy/third/erp/task/ERPInOrOutService.java | 4 ++--
src/main/java/com/zy/asrs/controller/OutController.java | 5 ++++-
src/main/java/com/zy/third/lk/task/LKInTBScheduler.java | 2 ++
src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java | 2 +-
6 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index ea2ca04..115fa8d 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -277,6 +277,9 @@
public R list(@RequestHeader(required = false) String appkey, @RequestBody(required = false) LocMast param) {
auth(appkey, param, request);
LocMast locMast = locMastService.selectById(param.getLocNo());
+ if (locMast == null) {
+ return R.error("搴撲綅涓嶅瓨鍦�");
+ }
List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
HashMap<String, Object> map = new HashMap<>();
map.put("status", locMast.getLocSts());
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index e90ffd1..fa9e416 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -10,6 +10,7 @@
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.service.*;
+import com.zy.asrs.utils.MatCompareUtils;
import com.zy.common.model.LocDto;
import com.zy.common.model.TaskDto;
import com.zy.common.web.BaseController;
@@ -79,7 +80,9 @@
}
for (LocDetl locDetl : locDetls) {
- if (locDetl.getMatnr().equals(orderDetl.getMatnr())) {
+ if (MatCompareUtils.compare(locDetl,orderDetl)) {
+
+ // if (locDetl.getMatnr().equals(orderDetl.getMatnr())) {
if (issued > 0) {
LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 5ccc4ad..4750a5d 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -1,5 +1,6 @@
package com.zy.asrs.task.handler;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.*;
@@ -357,6 +358,8 @@
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
}
+ }else {
+ log.info("鍗曟嵁鎵句笉鍒帮紝{}锛寋}",wrkDetl.getOrderNo(), JSON.toJSON(wrkDetl));
}
} catch (Exception ignore) {
log.error("fail", ignore);
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
index c98e298..2262851 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
@@ -196,7 +196,7 @@
null, // 瀹炰粯閲戦
null, // 浠樻绫诲瀷
null, // 涓氬姟鍛�
- null, // 缁撶畻澶╂暟
+ 1, // 缁撶畻澶╂暟
null, // 閭垂鏀粯绫诲瀷
null, // 閭垂
null, // 浠樻鏃堕棿
diff --git a/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java b/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java
index 3c9fddd..9cc27fa 100644
--- a/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java
+++ b/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java
@@ -85,7 +85,7 @@
null, // 瀹炰粯閲戦
null, // 浠樻绫诲瀷
null, // 涓氬姟鍛�
- null, // 缁撶畻澶╂暟
+ 1, // 缁撶畻澶╂暟
null, // 閭垂鏀粯绫诲瀷
null, // 閭垂
null, // 浠樻鏃堕棿
@@ -186,7 +186,7 @@
null, // 瀹炰粯閲戦
null, // 浠樻绫诲瀷
null, // 涓氬姟鍛�
- null, // 缁撶畻澶╂暟
+ 1, // 缁撶畻澶╂暟
null, // 閭垂鏀粯绫诲瀷
null, // 閭垂
null, // 浠樻鏃堕棿
diff --git a/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java b/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java
index 3fe2ef9..82eae19 100644
--- a/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java
+++ b/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java
@@ -242,6 +242,8 @@
if (orderDetl.getQty() > orderDetl.getAnfme() && orderDetl.getQty() > orderDetl.getWorkQty()) {
log.info("淇閿欒鏁伴噺锛歿}", JSON.toJSON(orderDetl));
content.put("MainNum", orderDetl.getWorkQty());
+ } else if (orderDetl.getAnfme() == orderDetl.getWorkQty() && orderDetl.getQty() <= 0) {
+ content.put("MainNum", orderDetl.getWorkQty());
} else {
content.put("MainNum", orderDetl.getQty());
}
--
Gitblit v1.9.1