From b51eadaa66a5c0ee6da0e418a3ba193dfc878fca Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 03 七月 2025 13:21:56 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/common/service/CommonService.java | 40 +++-------------------------------------
1 files changed, 3 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index bdbca00..5d55b8f 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -140,39 +140,7 @@
log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�", sourceStaNo);
break;
case 4:
- //TODO zhangc 涓存椂
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .in("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue())
- .eq("crn_no", 7)
- .eq("loc_type1", locTypeDto.getLocType1())
- .in("row1", 8).in("bay1", 1, 8).orderBy("row1"));
- StartupDto startupDto = new StartupDto();
- if (Utils.BooleanWhsTypeSta(rowLastno, staDescId)) {
- // 鑾峰彇鐩爣绔�
- Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
- .eq("type_no", staDescId)
- .eq("stn_no", sourceStaNo)
- .eq("crn_no", 7);
- StaDesc staDesc = staDescService.selectOne(wrapper);
- if (Cools.isEmpty(staDesc)) {
- log.error("鍏ュ簱璺緞涓嶅瓨鍦�:type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, 7);
- } else {
- BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
- if (!staNo.getAutoing().equals("Y")) {
- log.error("鐩爣绔�" + staDesc.getCrnStn() + "涓嶅彲鐢�");
- }
- startupDto.setStaNo(staNo.getDevNo());
- }
- }
- // 鐢熸垚宸ヤ綔鍙�
- int workNo = getWorkNo(0);
- // 杩斿洖dto
- startupDto.setWorkNo(workNo);
- startupDto.setCrnNo(7);
- startupDto.setSourceStaNo(sourceStaNo);
- startupDto.setLocNo(locMasts.get(0).getLocNo());
- return startupDto;
- //return getLocNoRun4(whsType, staDescId, sourceStaNo, matnr, batch, grade, 4, locTypeDto, 0, mixture);
+// return getLocNoRun4(whsType, staDescId, sourceStaNo, matnr, batch, grade, 4, locTypeDto, 0, mixture);
case 5:
return getLocNoRun5(whsType, staDescId, sourceStaNo, matnr, batch, grade, 0, locTypeDto, 0);
case 6:
@@ -919,14 +887,12 @@
.ge("bay1", 3).le("bay1", 6)
.eq("crn_no", 7)
.eq("loc_type1", locTypeDto.getLocType1())
- .eq("lev1", locMastWrk.getLev1())
.orderBy("bay1", true));
} else {
locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("bay1", locMastWrk.getBay1())
.eq("crn_no", 7)
.eq("loc_type1", locTypeDto.getLocType1())
- .eq("lev1", locMastWrk.getLev1())
.orderBy("bay1", false));
}
if (Cools.isEmpty(locMasts)) {
@@ -1017,11 +983,11 @@
if (locMastGro1.getLocSts().equals("F")) {
LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_No", locMastGro1.getLocNo()));
if (!locDetl.getMatnr().equals(matnr) || !locDetl.getBatch().equals(batch)) {
- break;
+ continue;
}
}
if (locMastGro1.getLocSts().equals("P") || locMastGro1.getLocSts().equals("Q") || locMastGro1.getLocSts().equals("R")) {
- break;
+ continue;
}
if (locMastGro1.getLocSts().equals("O")) {
locMast = locMastGro1;
--
Gitblit v1.9.1