From 53bbc5731dd8c78490a27211aea331ff1360ed4e Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期六, 28 六月 2025 09:34:19 +0800
Subject: [PATCH] wms功能完善
---
src/main/java/com/zy/common/web/WcsController.java | 100 ++++++++++++++++++++++++++-----------------------
1 files changed, 53 insertions(+), 47 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index e070559..6fb03a4 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -248,52 +248,52 @@
StartupDto dto;
// 鍒ゆ柇璐存爣寮傚父锛屽妫�閲嶉噺寮傚父鐨勶紝涓嶅垎閰嶅簱浣嶏紝鍘诲線寮傚父鍙�1090
-// if ( !param.isTbFlag() || !param.isReinspection()) {
-//
-// // 鐢熸垚宸ヤ綔妗� ------------------------------------------------------
-// WrkMast wrkMast = new WrkMast();
-// wrkMast.setWrkNo(commonService.getWorkNo(0));
-// wrkMast.setIoTime(now);
-// wrkMast.setIoType(3); // 鍏ュ嚭搴撶被鍨�3.绔欏埌绔�
-// wrkMast.setWrkSts(2L);
-// wrkMast.setIoPri(13D); // 浼樺厛绾�
-//// wrkMast.setCrnNo(dto.getCrnNo());
-// wrkMast.setSourceStaNo(param.getSourceStaNo());
-// wrkMast.setStaNo(1090);
-//// wrkMast.setLocNo(dto.getLocNo());
-// wrkMast.setBarcode(wrkMast1.getBarcode()); // 鎵樼洏鐮�
-// wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
-//// wrkMast.setPicking("N"); // 鎷ｆ枡
-//// wrkMast.setExitMk("N"); // 閫�鍑�
-//// wrkMast.setEmptyMk("N"); // 绌烘澘
-//// wrkMast.setLinkMis("Y");
-//// wrkMast.setCtnType(wrkMast1.getCtnType()); // 灏炬墭鏍囪瘑
-// wrkMast.setPdcType(wrkMast1.getPdcType()); // 绌烘《绫诲瀷
-// wrkMast.setAppeTime(now);
-// wrkMastService.insert(wrkMast);
-//
-// // 鐢熸垚宸ヤ綔妗ｆ槑缁�----------------------------------------------------
-// WrkDetl wrkDetl = new WrkDetl();
-// wrkDetl.sync(mat);
-// wrkDetl.setWrkNo(wrkMast.getWrkNo());
-// wrkDetl.setAnfme(wrkDetl1.getAnfme());
-// wrkDetl.setZpallet(wrkMast1.getBarcode());
-// wrkDetl.setBatch(param.getBatch());
-// wrkDetl.setManuDate(param.getManuDate());
-// wrkDetl.setWeight(param.getWeight());
-// wrkDetl.setManLength(param.getGrossWeight());
-// wrkDetl.setVolume(param.getCannedVolume()); // 缃愯閲�
-// wrkDetl.setInspect(param.isTbFlag()?1:0); // 璐存爣鎴愬姛
-// wrkDetl.setIoTime(now);
-// wrkDetl.setAppeTime(now);
-// wrkDetl.setModel(wrkDetl1.getMaktx()); // 淇濆瓨绌烘《鍚嶇О
-// wrkDetlService.insert(wrkDetl);
-//
-// dto = new StartupDto();
-// dto.setWorkNo(wrkMast.getWrkNo());
-// dto.setSourceStaNo(wrkMast.getSourceStaNo());
-// dto.setStaNo(wrkMast.getStaNo());
-// } else
+ if ( !param.isTbFlag() || !param.isReinspection()) {
+
+ // 鐢熸垚宸ヤ綔妗� ------------------------------------------------------
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(commonService.getWorkNo(0));
+ wrkMast.setIoTime(now);
+ wrkMast.setIoType(3); // 鍏ュ嚭搴撶被鍨�3.绔欏埌绔�
+ wrkMast.setWrkSts(2L);
+ wrkMast.setIoPri(13D); // 浼樺厛绾�
+// wrkMast.setCrnNo(dto.getCrnNo());
+ wrkMast.setSourceStaNo(param.getSourceStaNo());
+ wrkMast.setStaNo(1090);
+// wrkMast.setLocNo(dto.getLocNo());
+ wrkMast.setBarcode(wrkMast1.getBarcode()); // 鎵樼洏鐮�
+ wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+// wrkMast.setPicking("N"); // 鎷ｆ枡
+// wrkMast.setExitMk("N"); // 閫�鍑�
+// wrkMast.setEmptyMk("N"); // 绌烘澘
+// wrkMast.setLinkMis("Y");
+// wrkMast.setCtnType(wrkMast1.getCtnType()); // 灏炬墭鏍囪瘑
+ wrkMast.setPdcType(wrkMast1.getPdcType()); // 绌烘《绫诲瀷
+ wrkMast.setAppeTime(now);
+ wrkMastService.insert(wrkMast);
+
+ // 鐢熸垚宸ヤ綔妗ｆ槑缁�----------------------------------------------------
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(mat);
+ wrkDetl.setWrkNo(wrkMast.getWrkNo());
+ wrkDetl.setAnfme(wrkDetl1.getAnfme());
+ wrkDetl.setZpallet(wrkMast1.getBarcode());
+ wrkDetl.setBatch(param.getBatch());
+ wrkDetl.setManuDate(param.getManuDate());
+ wrkDetl.setWeight(param.getWeight());
+ wrkDetl.setManLength(param.getGrossWeight());
+ wrkDetl.setVolume(param.getCannedVolume()); // 缃愯閲�
+ wrkDetl.setInspect(param.isTbFlag()?1:0); // 璐存爣鎴愬姛
+ wrkDetl.setIoTime(now);
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setModel(wrkDetl1.getMaktx()); // 淇濆瓨绌烘《鍚嶇О
+ wrkDetlService.insert(wrkDetl);
+
+ dto = new StartupDto();
+ dto.setWorkNo(wrkMast.getWrkNo());
+ dto.setSourceStaNo(wrkMast.getSourceStaNo());
+ dto.setStaNo(wrkMast.getStaNo());
+ } else
if(fhFlag) { // 鐩存帴鍙戣揣
// 鐢熸垚宸ヤ綔妗� ------------------------------------------------------
WrkMast wrkMast = new WrkMast();
@@ -456,8 +456,14 @@
if(!param.isTbFlag()) { //涓嬬嚎鍑哄簱
wrkMast.setSourceStaNo(1090);
- wrkMast.setStaNo(1024); // 寮傚父涓嬬嚎榛樿鍏ュ簱绔欑偣涓�1016
+ wrkMast.setStaNo(1024); // 寮傚父涓嬬嚎榛樿鍏ュ簱绔欑偣涓�1024
+ // 鑾峰彇绯荤粺閰嶇疆锛岀湅鎴愬搧缃愯瀹屾垚鏄惁鐩存帴鍑哄埌鍙戣揣鍙�
+ Config config = configService.selectConfigByCode("gzxfh" + param.getSourceStaNo());
+ if (config != null && config.getStatus() == 1 && !Cools.isEmpty(config.getValue())) {
+ wrkMast.setStaNo(Integer.parseInt(config.getValue()));
+ }
wrkMastService.updateById(wrkMast);
+ log.info("WCS寮傚父鍙ｅ叆搴撴帴鍙ｈ繑鍙�:{},鐩爣绔欑偣:{}", "涓嬬嚎鍑哄簱", wrkMast.getStaNo());
return R.ok();
}
--
Gitblit v1.9.1