From 8bc35cc4f75cfb435577e34763002f69def6a1a2 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期六, 07 二月 2026 16:53:18 +0800
Subject: [PATCH] 调试
---
src/main/java/com/zy/common/service/CommonService.java | 80 +++++++++++++++++++++++++++++++++++++--
1 files changed, 75 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index b72676b..a3877bf 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -119,7 +119,15 @@
@Transactional
public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, LocTypeDto locTypeDto) {
whsType = Utils.GetWhsType(sourceStaNo);
- return getLocNoToOne(whsType, staDescId, sourceStaNo, matnr, batch, grade, 0, locTypeDto, 0);
+ StartupDto startupDto = new StartupDto();
+ if (staDescId == 1){
+ // 婊℃墭鐩樺叆搴�
+ startupDto = getLocNoToOne(whsType, staDescId, sourceStaNo, matnr, batch, grade, 0, locTypeDto, 0);
+ }else if (staDescId == 10){
+ // 绌烘墭鐩樺叆搴�
+ startupDto = getLocNoToTwo(whsType, staDescId, sourceStaNo, matnr, batch, grade, 0, locTypeDto, 0);
+ }
+ return startupDto;
}
/**
@@ -378,18 +386,80 @@
return startupDto;
}
- /*闀囨睙鎭掔珛鍗曚几绔嬪簱閫昏緫*/
+ /*闀囨睙鎭掔珛鍗曚几绔嬪簱閫昏緫 婊℃墭鐩樺叆搴�*/
@Transactional
public StartupDto getLocNoToOne(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
//鐩爣搴撲綅
LocMast locMast = null;
- if (locTypeDto.getLocType2()==5||locTypeDto.getLocType2()==6){
- //1鍙峰贩閬� 3绉嶈揣鐗╃被鍨�
- locMast=locMastService.queryLocToOne(locTypeDto.getLocType1());
+ if (locTypeDto.getLocType2()==5){
+ //1鍙峰贩閬� 鍗曠嫭鐨勬墭鐩�
+ locMast=locMastService.queryLocToOne(locTypeDto.getLocType2());
+
+ }else if (locTypeDto.getLocType2() == 6){
+ //1鍙峰贩閬� 娣风敤鎵樼洏
+ locMast=locMastService.queryLocToSpecal(locTypeDto.getLocType1());
}else if (locTypeDto.getLocType2()==7||locTypeDto.getLocType2()==8){
//2鍙峰贩閬� 2绉嶈揣鐗╃被鍨�
locMast=locMastService.queryLocToTwo(locTypeDto.getLocType2());
+
+ }else {
+ throw new CoolException("涓嶅瓨鍦ㄨ搴撲綅绫诲瀷:"+locTypeDto.getLocType2());
+ }
+ if (locMast == null){
+ throw new CoolException("鍏ュ簱娌℃湁绌哄簱浣�");
+ }
+
+ //鍫嗗灈鏈哄彿
+ Integer crnNo = locMast.getCrnNo();
+
+ //鑾峰彇鐩爣绔�
+ Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+ .eq("type_no", staDescId)
+ .eq("stn_no", sourceStaNo)
+ .eq("crn_no", crnNo);
+ StaDesc staDesc = staDescService.selectOne(wrapper);
+ if (Cools.isEmpty(staDesc)){
+ log.error("鍏ュ簱璺緞涓嶅瓨鍦�,staDesc={},sourceStaNo={},crnNo={}",1,staDescId,crnNo);
+ throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+ }
+
+ //妫�娴嬬洰鏍囩珯
+ BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
+ if (!staNo.getAutoing().equals("Y")){
+ throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+ }
+
+ //鐢熸垚宸ヤ綔鍙�
+ int workNo = getWorkNo(0);
+
+ //杩斿洖dto
+ StartupDto startupDto =new StartupDto();
+ startupDto.setWorkNo(workNo);
+ startupDto.setLocNo(locMast.getLocNo());
+ startupDto.setStaNo(staNo.getDevNo());
+ startupDto.setCrnNo(crnNo);
+ startupDto.setSourceStaNo(sourceStaNo);
+ return startupDto;
+ }
+
+ /*闀囨睙鎭掔珛鍗曚几绔嬪簱閫昏緫 绌烘墭鐩樺叆搴�*/
+ @Transactional
+ public StartupDto getLocNoToTwo(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
+ //鐩爣搴撲綅
+ LocMast locMast = null;
+ if (locTypeDto.getLocType2()==5){
+ //1鍙峰贩閬� 鍗曠嫭鐨勬墭鐩�
+ locMast=locMastService.queryLocToOne(locTypeDto.getLocType2());
+
+ }else if (locTypeDto.getLocType2() == 6){
+ //1鍙峰贩閬� 娣风敤鎵樼洏
+ locMast=locMastService.queryLocToSpecal(locTypeDto.getLocType1());
+
+ }else if (locTypeDto.getLocType2()==7||locTypeDto.getLocType2()==8){
+ //2鍙峰贩閬� 2绉嶈揣鐗╃被鍨�
+ locMast=locMastService.queryLocToTwo(locTypeDto.getLocType2());
+
}else {
throw new CoolException("涓嶅瓨鍦ㄨ搴撲綅绫诲瀷:"+locTypeDto.getLocType2());
}
--
Gitblit v1.9.1