From b398abe30eb0dc99ffb8f8620567deee26e3dbda Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 05 五月 2025 15:10:55 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 8 ++++++--
src/main/webapp/static/js/pakStoreSxk/stockOut.js | 2 +-
src/main/webapp/static/js/pakStoreSxk/emptyOut.js | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 237d191..ea66af4 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -184,8 +184,12 @@
if (staNo.getDevNo() == 1135 && locMast.getLocType1() == 2) {
throw new CoolException("鎵�閫夊簱浣嶄笉鏄綆搴撲綅鏃犳硶璋冩嫧锛屽簱浣嶅彿锛歿}" + locMast.getLocNo());
}
- // 鍚姩鍑哄簱寮�濮� 101.鍑哄簱
- stockOut(staNo, locDetlDtos, null, userId);
+ if(staNo.getDevNo()>=1100){
+ // 鍚姩鍑哄簱寮�濮� 101.鍑哄簱
+ stockOut(staNo, locDetlDtos, null, userId);
+ }else {
+ stockOutSXK(staNo, locDetlDtos, null, userId);
+ }
} else {
throw new CoolException("鎵�閫夊簱浣嶅瓨鍦ㄧ姸鎬佷笉涓篎銆丏鐨勫簱浣嶏紝搴撲綅鍙凤細" + locMast.getLocNo() + " 銆佸綋鍓嶇姸鎬侊細" + locMast.getLocSts() + "-" + locMast.getLocSts$());
}
diff --git a/src/main/webapp/static/js/pakStoreSxk/emptyOut.js b/src/main/webapp/static/js/pakStoreSxk/emptyOut.js
index a4dcee1..0f441ca 100644
--- a/src/main/webapp/static/js/pakStoreSxk/emptyOut.js
+++ b/src/main/webapp/static/js/pakStoreSxk/emptyOut.js
@@ -116,7 +116,7 @@
layer.msg('璇疯嚦灏戦�変腑涓�琛屾暟鎹�');
} else {
$.ajax({
- url: baseUrl+"/empty/plate/out/start",
+ url: baseUrl+"/sxk/empty/plate/out/start",
headers: {'token': localStorage.getItem('token')},
data: {
outSite: staNo,
diff --git a/src/main/webapp/static/js/pakStoreSxk/stockOut.js b/src/main/webapp/static/js/pakStoreSxk/stockOut.js
index c803e89..f36c28e 100644
--- a/src/main/webapp/static/js/pakStoreSxk/stockOut.js
+++ b/src/main/webapp/static/js/pakStoreSxk/stockOut.js
@@ -80,7 +80,7 @@
locDetls: locDetlData
}
$.ajax({
- url: baseUrl+"/plate/out/start",
+ url: baseUrl+"/sxk/plate/out/start",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify(param),
contentType:'application/json;charset=UTF-8',
--
Gitblit v1.9.1