From 55773cf8183b9ddb45a4321de3468d727cea88fd Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期一, 21 四月 2025 17:18:00 +0800
Subject: [PATCH] qw
---
src/main/java/com/zy/common/service/CommonService.java | 34 +---------------------------------
1 files changed, 1 insertions(+), 33 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..e0f8845 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:
--
Gitblit v1.9.1