From 73df1a92d6fd2696d4f359efa19e4b684317d732 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期日, 17 九月 2023 18:46:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 99 +++++++++++++++++++++++++------------------------
1 files changed, 50 insertions(+), 49 deletions(-)
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