From 4f269500cb79f0762ad8f484e6db5c32a3bc7191 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期一, 21 四月 2025 09:11:58 +0800
Subject: [PATCH] qw
---
src/main/java/com/zy/asrs/utils/Utils.java | 14 ++++++++------
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 8 ++++----
2 files changed, 12 insertions(+), 10 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 fcf1a3f..48629e5 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -169,7 +169,7 @@
// 鐩爣绔欑偣鐘舵�佹娴�
BasDevp staNo = basDevpService.checkSiteStatus(param.getOutSite());
// 鍒ゆ柇鍏ュ簱妯″紡
- OutStockInterceptUtil.outStockIntercept(param.getOutSite());
+ //OutStockInterceptUtil.outStockIntercept(param.getOutSite());
// 鑾峰彇搴撲綅鏄庣粏
List<LocDetlDto> locDetlDtos = new ArrayList<>();
for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
@@ -762,7 +762,7 @@
throw new CoolException("绔欑偣涓嶅瓨鍦�");
}
// 鍒ゆ柇鍏ュ簱妯″紡
- OutStockInterceptUtil.outStockIntercept(param.getOutSite());
+ //OutStockInterceptUtil.outStockIntercept(param.getOutSite());
for (String locNo : param.getLocNos()) {
// 鑾峰彇宸ヤ綔鍙�
int workNo = commonService.getWorkNo(WorkNoType.PAKOUT.type);
@@ -891,7 +891,7 @@
// 鐩爣绔欑偣鐘舵�佹娴�
BasDevp staNo = basDevpService.checkSiteStatus(param.getOutSite());
// 鍒ゆ柇鍏ュ簱妯″紡
- OutStockInterceptUtil.outStockIntercept(param.getOutSite());
+ //OutStockInterceptUtil.outStockIntercept(param.getOutSite());
// 鑾峰彇搴撲綅鏄庣粏
List<LocDetlDto> locDetlDtos = new ArrayList<>();
for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
@@ -919,7 +919,7 @@
// 鐩爣绔欑偣鐘舵�佹娴�
BasDevp staNo = basDevpService.checkSiteStatus(param.getOutSite());
// 鍒ゆ柇鍏ュ簱妯″紡
- OutStockInterceptUtil.outStockIntercept(param.getOutSite());
+ //OutStockInterceptUtil.outStockIntercept(param.getOutSite());
// 鑾峰彇搴撲綅鏄庣粏
List<LocDetlDto> locDetlDtos = new ArrayList<>();
for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 3af7671..28b4960 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -318,6 +318,8 @@
return LocNecessaryParametersDoubleExtension6(rowLastno, curRow, crnNumber); //宸插畬鍠�
case 7://骞冲簱 CTU搴�
return LocNecessaryParametersDoubleExtension7(rowLastno, curRow, crnNumber); //宸插畬鍠�
+ case 8://鍥涘悜搴�(鐗涚溂杞�)eg:鍏夋嘲鍥涘悜
+ return LocNecessaryParametersDoubleExtension6(rowLastno, curRow, crnNumber); //宸插畬鍠�
default:
return LocNecessaryParametersMove(rowLastno, curRow, crnNumber);//moveCrnNo
}
@@ -528,20 +530,20 @@
//婊℃澘姝ｅ父鍏ュ簱
switch (curRow){
case 1:
- necessaryParameters[1] = 1; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = 1; //nearRow 鏈�娴呭簱浣嶆帓
- break;
- case 6:
necessaryParameters[1] = 3; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = 6; //nearRow 鏈�娴呭簱浣嶆帓
break;
- case 13:
+ case 3:
necessaryParameters[1] = 8; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = 8; //nearRow 鏈�娴呭簱浣嶆帓
break;
+ case 8:
+ necessaryParameters[1] = 1; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = 1; //nearRow 鏈�娴呭簱浣嶆帓
+ break;
default:
throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
}
--
Gitblit v1.9.1