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/asrs/task/handler/WorkMastHandler.java | 4 +-
src/main/java/com/zy/common/web/WcsController.java | 15 +++++--
src/main/webapp/static/js/common.js | 3 +
pom.xml | 3 +
src/main/java/com/zy/common/service/CommonService.java | 56 +++++++++++++++++++++++++++
src/main/resources/application.yml | 2
6 files changed, 73 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index 50ef277..78ceb00 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,7 +119,8 @@
<build>
- <finalName>rqdzasrs</finalName>
+<!-- <finalName>rqdzasrs</finalName>-->
+ <finalName>czkhasrs</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 7acd213..738215a 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -370,7 +370,7 @@
// 淇敼婧愬簱浣嶇姸鎬� R ===>> O
if (locMast.getLocSts().equals("R")) {
locMast.setLocSts("O");
- locMast.setBarcode("");
+// locMast.setBarcode("");//鎵樼洏涓庡簱浣嶇粦瀹�
locMast.setModiTime(now);
locMast.setIoTime(now);
if (!locMastService.updateById(locMast)) {
@@ -385,7 +385,7 @@
// 淇敼搴撲綅鐘舵�� R ===>> O
if (locMast.getLocSts().equals("R")) {
locMast.setLocSts("O");
- locMast.setBarcode("");
+// locMast.setBarcode("");//鎵樼洏涓庡簱浣嶇粦瀹�
locMast.setModiTime(now);
locMast.setIoTime(now);
if (!locMastService.updateById(locMast)) {
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;
+ }
}
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 4e905dd..6d8de64 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -333,7 +333,8 @@
// 妫�绱㈠簱浣�
List<String> matnrs = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList());
- StartupDto dto = commonService.getLocNo(1, 1, devpNo, matnrs.get(0), batchs.get(0), null, locTypeDto);
+// StartupDto dto = commonService.getLocNo(1, 1, devpNo, matnrs.get(0), batchs.get(0), null, locTypeDto);
+ StartupDto dto = commonService.getLocNo(1, 1, devpNo, matnrs.get(0), batchs.get(0), null, locTypeDto,barcode);
int workNo = dto.getWorkNo();
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
@@ -345,8 +346,8 @@
wrkMast.setIoPri(13D); // 浼樺厛绾�
wrkMast.setCrnNo(dto.getCrnNo());
wrkMast.setSourceStaNo(dto.getSourceStaNo());
- wrkMast.setStaNo(dto.getStaNo());
- wrkMast.setLocNo(dto.getLocNo());
+ wrkMast.setStaNo(dto.getStaNo());// 鐩爣绔�
+ wrkMast.setLocNo(dto.getLocNo());// 鐩爣搴撲綅
wrkMast.setBarcode(barcode); // 鎵樼洏鐮�
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
@@ -417,6 +418,9 @@
if (locMast.getLocSts().equals("O")) {
locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
locMast.setModiTime(now);
+ if (locMast.getBarcode()==null){
+ locMast.setBarcode(barcode);//鎵樼洏涓庡簱浣嶇粦瀹�
+ }
if (!locMastService.updateById(locMast)) {
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}
@@ -431,7 +435,7 @@
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
- StartupDto dto = commonService.getLocNo(1, 10, devpNo, null, null, null, locTypeDto);
+ StartupDto dto = commonService.getLocNo(1, 10, devpNo, null, null, null, locTypeDto,barcode);
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
@@ -469,6 +473,9 @@
if (locMast.getLocSts().equals("O")) {
locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
locMast.setModiTime(new Date());
+ if (locMast.getBarcode()==null){
+ locMast.setBarcode(barcode);//鎵樼洏涓庡簱浣嶇粦瀹�
+ }
if (!locMastService.updateById(locMast)) {
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0cf9f7b..474bd63 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -40,7 +40,7 @@
#License鐩稿叧閰嶇疆
license:
- subject: rqdzasrs
+ subject: czkhasrs
publicAlias: publicCert
storePass: public_zhongyang_123456789
licensePath: license.lic
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index c4543e4..b54fd45 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -1,4 +1,5 @@
-var baseUrl = "/rqdzasrs";
+// var baseUrl = "/rqdzasrs";
+var baseUrl = "/czkhasrs";
// 璇︽儏绐楀彛-楂樺害
var detailHeight = '80%';
--
Gitblit v1.9.1