From dd76858f35bb4fdd76d5976465e9bd96267b0f0b Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期三, 06 五月 2026 09:50:53 +0800
Subject: [PATCH] 初始化
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 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 f86fcc3..e1b19df 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -103,11 +103,16 @@
// Config outModel = configService.selectConfigByCode("outModel");
// if (outModel.getValue().equals("Y")) {
// // 娌℃湁鍒�305鐨勫嚭搴撲换鍔�(305鐨勫嚭搴撲换鍔′紭鍏�)
-// int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 101)
-// .eq("sta_no", 305));
-// if (count > 0) {
-// return R.parse("瀛樺湪305鍑哄簱浠诲姟");
+// int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 101)
+// .eq("sta_no", 305));
+// if (count > 0) {
+// BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 305));
+// if (basDevp.getAutoing().equals("Y") && basDevp.getLoading().equals("Y") && basDevp.getWrkNo() > 6000 && basDevp.getWrkNo() <= 9000) {
+// log.info("鍑哄簱杞繍鏋跺埌杈�305");
+// return R.ok("鍑哄簱杞繍鏋跺埌杈�305");
// }
+// return R.parse("鍑哄簱浠诲姟鎵ц涓�");
+// }
// outModel.setValue("N");
// configService.updateById(outModel);
// }
@@ -155,7 +160,9 @@
waitPakin.setModiTime(now);
// 婧愮珯鐐圭姸鎬佹娴�
- BasDevp sourceStaNo = basDevpService.checkSiteStatus(305, true);
+ Integer inStaNo = combMat.getInStaNo(); // 鍏ュ簱绔欑偣
+// BasDevp sourceStaNo = basDevpService.checkSiteStatus(305, true);
+ BasDevp sourceStaNo = basDevpService.checkSiteStatus(inStaNo, true);
// 闀垮害>3500鏀惧搴撲綅
sourceStaNo.setLocType2((short) (waitPakin.getLength() > 4600 ? 2 : 1));
@@ -172,7 +179,7 @@
wrkMast.setIoTime(new Date());
wrkMast.setWrkSts(1L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
- wrkMast.setIoPri(13D); // 浼樺厛绾�
+ wrkMast.setIoPri(15D); // 浼樺厛绾�
wrkMast.setCrnNo(dto.getCrnNo());
wrkMast.setSourceStaNo(dto.getSourceStaNo());
wrkMast.setStaNo(dto.getStaNo());
@@ -228,7 +235,9 @@
@Override
public R agvAskOpen(AgvAskOpenParam param) {
if (param.getFlag() == 0) { // 鍑哄簱璇锋眰wms寮�闂�
- BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 305));
+ Integer staNo = param.getStaNo(); // 闇�瑕佸紑銆佸叧闂ㄧ殑绔欑偣
+// BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 305));
+ BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", staNo));
if (basDevp.getWrkNo() > 6000 && basDevp.getWrkNo() <= 9000 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")
&& basDevp.getOutEnable().equals("Y")) { // 鍑哄簱宸ヤ綔妗�
WrkMast wrkMast = wrkMastService.selectById(basDevp.getWrkNo());
@@ -254,12 +263,12 @@
return R.error("涓嶆弧瓒冲嚭搴撴潯浠�");
}
} else if(param.getFlag() == 1) { // 鍏ュ簱璇锋眰wms寮�闂�
- BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 305));
+// BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 305));
+ BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", param.getStaNo()));
if (basDevp.getAutoing().equals("Y") && basDevp.getLoading().equals("Y")
- && basDevp.getInEnable().equals("Y")) { // 鍏ュ簱搴曞骇
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type",1)
- .eq("source_sta_no",305).lt("wrk_sts",3));
- if (wrkMast.getWhsType() == null) {
+ && basDevp.getInEnable().equals("Y") && basDevp.getWrkNo() <= 3000) { // 鍏ュ簱搴曞骇
+ WrkMast wrkMast = wrkMastService.selectById(basDevp.getWrkNo());
+ if (wrkMast == null || wrkMast.getWhsType() == null) {
throw new CoolException("娌℃湁鍏ュ簱浠诲姟");
} else if (wrkMast.getWhsType() == 1) {
WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
--
Gitblit v1.9.1