From 89344984d80ff1652abbd1de0ef12977b652e2a4 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 08 九月 2023 14:01:09 +0800
Subject: [PATCH] #流程修改
---
src/main/java/com/zy/asrs/task/handler/BarcodeUploadHandler.java | 20 ++----
src/main/java/com/zy/asrs/controller/OpenController.java | 6 +-
src/main/java/com/zy/common/web/WcsController.java | 99 ++++++++++++++++----------------
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 11 ---
4 files changed, 61 insertions(+), 75 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 446a899..efc1528 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -260,7 +260,7 @@
/**
- * 涓帶锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�
+ * 涓帶锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭� 娴嬭瘯1
*/
@PostMapping("/cs1/auth/v1")
@AppAuth(memo = "涓帶锛氱爜鍨涘墠涓婃姤鏉＄爜,鐢熸垚娴嬭瘯宸ヤ綔妗�")
@@ -273,7 +273,7 @@
}
/**
- * 涓帶锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�
+ * 涓帶锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭� 娴嬭瘯2
*/
@PostMapping("/cs2/auth/v1")
@AppAuth(memo = "涓帶锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�,鐢熸垚娴嬭瘯宸ヤ綔妗�")
@@ -286,7 +286,7 @@
}
/**
- * 涓帶锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�
+ * 涓帶锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭� 娴嬭瘯3
*/
@PostMapping("/cs3/auth/v1")
@AppAuth(memo = "涓帶锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�,鐢熸垚娴嬭瘯宸ヤ綔妗�")
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 8164191..cf6a49e 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -723,14 +723,6 @@
// }
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type",201).eq("barcode", param.getBarcode()).eq("sta_no",param.getDevNo$()));
- if (Cools.isEmpty(wrkMast) || !wrkMast.getWrkSts().equals(42L)){
- throw new CoolException("鏌ヨ鎵樼洏澶辫触");
- }else {
- wrkMast.setWrkSts(wrkMast.getWrkSts()+1);
- }
-
-
if (locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()))!=0
|| wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()))!=0
|| waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()))!=0){
@@ -762,9 +754,6 @@
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
- }
- if (!wrkMastService.updateById(wrkMast)){
- throw new CoolException("寮傚父锛岃閲嶆柊鐢宠");
}
}
diff --git a/src/main/java/com/zy/asrs/task/handler/BarcodeUploadHandler.java b/src/main/java/com/zy/asrs/task/handler/BarcodeUploadHandler.java
index 4a60c5c..2aa7ee6 100644
--- a/src/main/java/com/zy/asrs/task/handler/BarcodeUploadHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/BarcodeUploadHandler.java
@@ -33,7 +33,7 @@
public class BarcodeUploadHandler extends AbstractHandler<String> {
@Autowired
- private WrkMastService wrkMastService;
+ private WaitPakinService waitPakinService;
@Autowired
private LocMastService locMastService;
@Autowired
@@ -53,20 +53,16 @@
public ReturnT<String> start(int staNo) {
try {
BasDevp basDevp = basDevpService.selectById(staNo);
- if (!Cools.isEmpty(basDevp) && basDevp.getWrkNo()!=0){
- WrkMast wrkMast = wrkMastService.selectById(basDevp.getWrkNo());
- if (!Cools.isEmpty(wrkMast) && wrkMast.getIoType().equals(201) && wrkMast.getWrkSts().equals(41L)){
+ if (!Cools.isEmpty(basDevp) && !Cools.isEmpty(basDevp.getBarcode()) && basDevp.getWrkNo()==9992){
+ WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", basDevp.getBarcode()));
+ if (Cools.isEmpty(waitPakin)){
ReturnT<String> result = null;
- result = postMesData(barcodeUploadpath,wrkMast);
+ result = postMesData(barcodeUploadpath,basDevp);
System.out.println(result);
if (result.getCode()==200){
- wrkMast.setWrkSts(42L);
- // 淇敼璁㈠崟鐘舵�� 41. ===>> 42.宸蹭笂鎶�
- if (!wrkMastService.updateById(wrkMast)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳:鏇存柊宸ヤ綔鍙�"+wrkMast.getWrkNo()+"宸ヤ綔妗ｇ姸鎬�41==銆�42澶辫触");
- }else {
- return SUCCESS;
- }
+ return SUCCESS;
+ }else {
+ log.error("鏉＄爜涓婁紶涓帶澶辫触");
}
}
}
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 437f064..e7f2109 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -99,9 +99,9 @@
case 10://绌烘墭鐩樺叆搴�
dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode());
break;
- case 201://鑷姩琛ョ┖鏉夸换鍔�
- dto = emptyPlateIn201(param.getSourceStaNo(), locTypeDto, param.getBarcode());
- break;
+// case 201://鑷姩琛ョ┖鏉夸换鍔�
+// dto = emptyPlateIn201(param.getSourceStaNo(), locTypeDto, param.getBarcode());
+// break;
default:
break;
}
@@ -293,52 +293,53 @@
/*...........................寰愬伐姹変簯..............浠ヤ笅.............涓婇ザ姹熼摐...........................*/
/*............................Created by Monkey D. Luffy on 2023.07.19.............................*/
- @Transactional
- public StartupDto emptyPlateIn201(Integer devpNo, LocTypeDto locTypeDto, String barcode) {
- // 婧愮珯鐐圭姸鎬佹娴�
- BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
- // 妫�绱㈠簱浣�
- StartupDto dto = commonService.getScanBarcodeEmptyBoard();
- if (dto.getStaNo()==0){
- return null;
- }
- Date now = new Date();
- dto.setSourceStaNo(devpNo);
- int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(201));
- // 鐢熸垚宸ヤ綔妗�
- WrkMast wrkMast = new WrkMast();
- wrkMast.setWrkNo(workNo);
- wrkMast.setIoTime(new Date());
- wrkMast.setWrkSts(41L); // 宸ヤ綔鐘舵�侊細鍓嶅線鐮佸灈浣�
- wrkMast.setIoType(201); // 鍏ュ嚭搴撶姸鎬侊細201銆佽嚜鍔ㄨˉ绌烘澘
- wrkMast.setIoPri(13D); // 浼樺厛绾�
- wrkMast.setCrnNo(0);
- wrkMast.setSourceStaNo(dto.getSourceStaNo());
- wrkMast.setStaNo(dto.getStaNo());
- wrkMast.setLocNo("");
- wrkMast.setFullPlt("N"); // 婊℃澘
- wrkMast.setPicking("N"); // 鎷ｆ枡
- wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setEmptyMk("Y"); // 绌烘澘
- wrkMast.setLinkMis("Y");
- wrkMast.setBarcode(barcode);
- wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
- // 鎿嶄綔浜哄憳鏁版嵁
- wrkMast.setAppeTime(now);
- wrkMast.setModiTime(now);
-
- boolean res = wrkMastService.insert(wrkMast);
- if (!res) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
- }
- // 鏇存柊婧愮珯鐐逛俊鎭�
- sourceStaNo.setWrkNo(workNo);
- sourceStaNo.setModiTime(now);
- if (!basDevpService.updateById(sourceStaNo)){
- throw new CoolException("鏇存柊婧愮珯澶辫触");
- }
- return dto;
- }
+ // 201銆佽嚜鍔ㄨˉ绌烘澘
+// @Transactional
+// public StartupDto emptyPlateIn201(Integer devpNo, LocTypeDto locTypeDto, String barcode) {
+// // 婧愮珯鐐圭姸鎬佹娴�
+// BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
+// // 妫�绱㈠簱浣�
+// StartupDto dto = commonService.getScanBarcodeEmptyBoard();
+// if (dto.getStaNo()==0){
+// return null;
+// }
+// Date now = new Date();
+// dto.setSourceStaNo(devpNo);
+// int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(201));
+// // 鐢熸垚宸ヤ綔妗�
+// WrkMast wrkMast = new WrkMast();
+// wrkMast.setWrkNo(workNo);
+// wrkMast.setIoTime(new Date());
+// wrkMast.setWrkSts(41L); // 宸ヤ綔鐘舵�侊細鍓嶅線鐮佸灈浣�
+// wrkMast.setIoType(201); // 鍏ュ嚭搴撶姸鎬侊細201銆佽嚜鍔ㄨˉ绌烘澘
+// wrkMast.setIoPri(13D); // 浼樺厛绾�
+// wrkMast.setCrnNo(0);
+// wrkMast.setSourceStaNo(dto.getSourceStaNo());
+// wrkMast.setStaNo(dto.getStaNo());
+// wrkMast.setLocNo("");
+// wrkMast.setFullPlt("N"); // 婊℃澘
+// wrkMast.setPicking("N"); // 鎷ｆ枡
+// wrkMast.setExitMk("N"); // 閫�鍑�
+// wrkMast.setEmptyMk("Y"); // 绌烘澘
+// wrkMast.setLinkMis("Y");
+// wrkMast.setBarcode(barcode);
+// wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
+// // 鎿嶄綔浜哄憳鏁版嵁
+// wrkMast.setAppeTime(now);
+// wrkMast.setModiTime(now);
+//
+// boolean res = wrkMastService.insert(wrkMast);
+// if (!res) {
+// throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+// }
+// // 鏇存柊婧愮珯鐐逛俊鎭�
+// sourceStaNo.setWrkNo(workNo);
+// sourceStaNo.setModiTime(now);
+// if (!basDevpService.updateById(sourceStaNo)){
+// throw new CoolException("鏇存柊婧愮珯澶辫触");
+// }
+// return dto;
+// }
/*...........................涓婇ザ姹熼摐..............浠ヤ笂.............寰愬伐姹変簯...........................*/
--
Gitblit v1.9.1