From b00eeab31bd13ba34a03301aa441b0751d6a93e4 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期五, 19 十二月 2025 17:00:51 +0800
Subject: [PATCH] 第六排成品可以放第七排原材料
---
src/main/java/com/zy/common/service/CommonService.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 58 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 6995422..779d5c7 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -518,6 +518,8 @@
crnNo = 2;
} else if(devpNo == 104) {
crnNo = 1;
+ }else if(devpNo == 311) {
+ crnNo = 4;
}
// 鐩爣搴撲綅
@@ -571,6 +573,13 @@
// 鐩爣搴撲綅
LocMast locMast = locMastMapper.queryLocByBarCode(row);
+
+ //绗叚鎺掓垚鍝佸彲浠ユ斁绗竷鎺掑師鏉愭枡
+ if (locMast == null && type.equals("2")){
+ locMast = locMastMapper.queryLocByBarCode(7);
+ }
+
+
if (locMast == null) {
throw new CoolException("304鍏ュ簱娌℃湁绌哄簱浣�");
}
@@ -604,6 +613,55 @@
return startupDto;
}
+ public StartupDto getLocNoBy311(String type) {
+
+ int row;
+ int devpNo = 311;
+ int crnNo = 4;
+// if (type.equals("1")) {
+// row = 7;
+// } else if (type.equals("2")) {
+// row = 6;
+// } else {
+// throw new CoolException("304鐗╂枡绫诲埆璇嗗埆閿欒锛�" + type);
+// }
+
+ // 鐩爣搴撲綅
+ List<LocMast> locMasts = locMastMapper.selectOneByCrnNo(4);
+ LocMast locMast = locMasts.get(0);
+ if (locMast == null) {
+ throw new CoolException("311鍏ュ簱娌℃湁绌哄簱浣�");
+ }
+
+ // 鑾峰彇鐩爣绔�
+ Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+ .eq("type_no", 1)
+ .eq("stn_no", devpNo)
+ .eq("crn_no", crnNo);
+ StaDesc staDesc = staDescService.selectOne(wrapper);
+ if (Cools.isEmpty(staDesc)) {
+ log.error("鍏ュ簱璺緞涓嶅瓨鍦�, staDescId={}, sourceStaNo={}, crnNo={}", 1, devpNo, crnNo);
+ throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+ }
+
+ // 妫�娴嬬洰鏍囩珯
+ BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
+ if (!staNo.getAutoing().equals("Y")) {
+ throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+ }
+
+ basCrnpService.checkSiteStatus(crnNo, true);
+
+ // 杩斿洖dto
+ StartupDto startupDto = new StartupDto();
+ startupDto.setWorkNo(getWorkNo(0));
+ startupDto.setCrnNo(crnNo);
+ startupDto.setSourceStaNo(devpNo);
+ startupDto.setStaNo(devpNo);
+ startupDto.setLocNo(locMast.getLocNo());
+ return startupDto;
+ }
+
/**
* 涓�鏈熷鎵惧簱浣�
* 1-6灞� 鏉＄爜1鎴栬��2寮�澶�
--
Gitblit v1.9.1