From 975823f4d07c91a67162f553be9ff4ac25f3d47d Mon Sep 17 00:00:00 2001
From: czkh <czkh@163.com>
Date: 星期四, 06 十一月 2025 13:41:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/czkhasrs' into czkhasrs
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index 0b56793..da0787a 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -43,6 +43,33 @@
return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > 1;
}
+ /*
+ *鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
+ * */
+ @Override
+ public LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos) {
+ if (curRow<nearRow){
+ return this.baseMapper.selectLocByLocStsPakInF1(locNos);
+ }
+ return this.baseMapper.selectLocByLocStsPakInF2(locNos);
+ }
+
+ /*
+ * 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅
+ * */
+ @Override
+ public LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,List<String> locNos) {
+ if (curRow<nearRow){
+ return this.baseMapper.selectLocByLocStsPakInO1(locNos);
+ }
+ return this.baseMapper.selectLocByLocStsPakInO2(locNos);
+ }
+
+ @Override
+ public LocMast selectByBarcode(String zpallet) {
+ return this.baseMapper.selectByBarcode(zpallet);
+ }
+
@Override
public Boolean checkWhole(List<LocDetl> locDetls) {
return null;
--
Gitblit v1.9.1