From 2bc10d832acd06bc6511e50405202fde99b0e7c2 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期六, 18 一月 2025 10:20:25 +0800
Subject: [PATCH] java 优化库位检索逻辑，添加AGV工作明细服务，修复定时任务
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index daac737..1cbee20 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -251,7 +251,7 @@
if (order.getSettle() == 4L) {
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
if (!orderService.updateSettle(order.getId(), 6L, null)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("璁㈠崟鐘舵�佷慨鏀�(4-6)澶辫触");
}
}
}
@@ -270,7 +270,7 @@
}
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
if (!orderService.updateSettle(order.getId(), 6L, null)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("璁㈠崟鐘舵�佷慨鏀�(4-6)澶辫触");
}
}
}
@@ -460,7 +460,7 @@
if (order.getSettle() == 4L) {
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
if (!orderService.updateSettle(order.getId(), 6L, null)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("璁㈠崟鐘舵�佷慨鏀�(4-6)澶辫触");
}
}
}
@@ -479,7 +479,7 @@
}
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
if (!orderService.updateSettle(order.getId(), 6L, null)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("璁㈠崟鐘舵�佷慨鏀�(4-6)澶辫触");
}
}
}
@@ -516,7 +516,7 @@
null // 澶囨敞
);
if (!packService.insert(pack)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("鎵撳寘澶辫触");
}
Mat mat = matService.selectByMatnr(analyse.getMatnr());
@@ -552,7 +552,7 @@
null // 澶囨敞
);
if (tagMapper.insert(priTag) == 0) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("鍒嗙被娣诲姞澶辫触");
}
}
// 浜岀骇鍒嗙被
@@ -581,7 +581,7 @@
null // 澶囨敞
);
if (tagMapper.insert(secTag) == 0) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("鍒嗙被娣诲姞澶辫触");
}
}
tagId = secTag.getId();
@@ -597,7 +597,7 @@
mat.setCreateTime(now);
mat.setUpdateTime(now);
if (!matService.insert(mat)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ throw new CoolException("鐗╂枡娣诲姞澶辫触");
} else {
log.info("鎵撳寘涓婄嚎娣诲姞鏂扮墿鏂橻鐗╂枡鍙凤細{}]", mat.getMatnr());
}
@@ -854,6 +854,12 @@
throw new CoolException("鍗曟嵁鍙傛暟涓虹┖鎴栬�呭崟鎹鎯呬负绌猴紝鏃犳硶鐢熸垚鍗曟嵁淇℃伅");
}
+ if ("閾跺骇鐢熶骇閫�鏂欑敵璇峰崟".equalsIgnoreCase(docName)) {
+ if (Cools.isEmpty(param.getBackOrderNo())){
+ throw new CoolException("閫�鏂欏崟鐨勯��鏂欑紪鍙穊ackOrderNo涓嶈兘涓虹┖");
+ }
+ }
+
Order orderOld = null;
if (!Cools.isEmpty(orderService.selectByNo(param.getCPOID()))) {
@@ -992,6 +998,7 @@
order.setCreateTime(now);
order.setUpdateBy(9999L);
order.setUpdateTime(now);
+ order.setSalesman(param.getBackOrderNo());
order.setUpstreamcode(param.getUpstreamcode());
//璁㈠崟鐘舵��
order.setSettle(1L);
@@ -1026,6 +1033,7 @@
od.setAnfme(odParam.getIQuantity());
//閿�鍞鍗曞彿
od.setThreeCode(odParam.getCDefine22());
+ od.setDevNo(odParam.getDevNo());
//鑷敱椤�
if (!Cools.isEmpty(odParam.getBatch()) || !Cools.isEmpty(odParam.getBFree1())) {
od.setBatch((Cools.isEmpty(odParam.getBatch()) ? "" : odParam.getBatch()) + "__" + (Cools.isEmpty(odParam.getBFree1()) ? "" : odParam.getBFree1()));
--
Gitblit v1.9.1