From 9c08f3ae419992dda4f4f3ff4650fafd6585ebae Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期三, 24 九月 2025 11:00:00 +0800
Subject: [PATCH] 初始化
---
src/main/java/com/zy/common/service/CommonService.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 55 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 9999e58..9c1a0d7 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -126,6 +126,12 @@
return getLocNo(whsType,staDescId,sourceStaNo,matnr,batch,grade,0,locTypeDto,0);
}
+ @Transactional
+ public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, LocTypeDto locTypeDto,String barcode) {
+ whsType = Utils.GetWhsType(sourceStaNo);
+ return getLocNo1(whsType,staDescId,sourceStaNo,matnr,batch,grade,0,locTypeDto,0,barcode);
+ }
+
/**
* 妫�绱㈠簱浣嶅彿
*
@@ -247,7 +253,7 @@
}
// // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 //鍒嗙鐗�
-// if (staDescId == 10) {
+// if (staDescId == 10) {
// List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
// for (LocMast locMast1:locMasts){
// if (VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
@@ -365,4 +371,52 @@
startupDto.setLocNo(locNo);
return startupDto;
}
+
+ /*
+ * 妫�绱㈠簱浣嶅彿
+ * */
+ @Transactional
+ public StartupDto getLocNo1(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times,String barcode){
+ StartupDto startupDto = new StartupDto();
+ Wrapper<StaDesc> wrapper = null;
+ StaDesc staDesc = null;
+ BasDevp staNo = null;
+ int crnNo = 1; //鍫嗗灈鏈哄彿
+ if (Utils.BooleanWhsTypeSta(whsType, staDescId)) {
+ // 鑾峰彇鐩爣绔�
+ wrapper = new EntityWrapper<StaDesc>()
+ .eq("type_no", staDescId)
+ .eq("stn_no", sourceStaNo)
+ .eq("crn_no", crnNo);
+ staDesc = staDescService.selectOne(wrapper);
+ if (Cools.isEmpty(staDesc)) {
+ log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
+ throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+// crnNo = 0;
+ }
+ staNo = basDevpService.selectById(staDesc.getCrnStn());
+ if (!staNo.getAutoing().equals("Y")) {
+ throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+// crnNo = 0;
+ }
+ startupDto.setStaNo(staNo.getDevNo());
+ }
+ int workNo = getWorkNo(0);
+ startupDto.setWorkNo(workNo);
+ startupDto.setSourceStaNo(sourceStaNo);
+ startupDto.setCrnNo(1);
+ //绗竴娆″叆搴�
+ //鍚庣画鍏ュ簱锛堟墭鐩樺拰搴撲綅宸茬粡缁戝畾锛�
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("barcode", barcode));
+ if (locMast != null){
+ if (!locMast.getLocSts().equals("O")){
+ log.error("涓庤鎵樼洏缁戝畾鐨勫簱浣嶅凡琚崰鐢紝鎵樼洏鐮侊細{}锛屽簱浣嶅彿锛歿}",barcode,locMast.getLocNo());
+ } else {
+ startupDto.setLocNo(locMast.getLocNo());
+ }
+ } else {
+ //鎵樼洏涓庡簱浣嶆湭缁戝畾 璧扮涓�娆″叆搴撻�昏緫
+ }
+ return startupDto;
+ }
}
--
Gitblit v1.9.1