From 1d3fdb2bf289396fb5d20aa48783c02b55f2d95d Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期日, 13 七月 2025 16:55:28 +0800
Subject: [PATCH] 增加空托出库条件(堆垛机自动+无报警码)
---
src/main/java/com/zy/common/web/WcsController.java | 119 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 69 insertions(+), 50 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 8230f84..0f37693 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -8,6 +8,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
+import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.entity.result.FindLocNoAttributeVo;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.mapper.WrkMastMapper;
@@ -102,7 +103,7 @@
if(param.getIoType() == 1) {
List<SearchLocParam.WantBucket> wantBucketFlag = param.getWantBucketFlag();
for(SearchLocParam.WantBucket wantBucket: wantBucketFlag) {
- if(wantBucket.getBucketType() != 0 && wantBucket.getBucketType() == param.getBucketType()) { // 缃愯绾挎湁瑕佹《淇″彿骞朵笖褰撳墠妗舵槸缃愯绾胯鐨勬《
+ if(wantBucket.getBucketType() != 0 && wantBucket.getBucketType() == param.getBucketType() && wantBucket.getWantBucketCount() >= 1) { // 缃愯绾挎湁瑕佹《淇″彿骞朵笖褰撳墠妗舵槸缃愯绾胯鐨勬《
if(waitPakin == null) {
return R.error("鍏ュ簱閫氱煡妗ｄ负绌�");
} else {
@@ -247,51 +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.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(!param.isTbFlag() ? "璐存爣澶辫触" : "澶嶆閲嶉噺寮傚父");
+ 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();
@@ -325,6 +327,7 @@
wrkDetl.setManuDate(param.getManuDate());
wrkDetl.setWeight(param.getWeight());
wrkDetl.setManLength(param.getGrossWeight());
+ wrkDetl.setVolume(param.getCannedVolume()); // 缃愯閲�
wrkDetl.setInspect(1);
wrkDetl.setIoTime(now);
wrkDetl.setAppeTime(now);
@@ -378,6 +381,7 @@
wrkDetl.setManuDate(param.getManuDate());
wrkDetl.setWeight(param.getWeight());
wrkDetl.setManLength(param.getGrossWeight());
+ wrkDetl.setVolume(param.getCannedVolume());
wrkDetl.setInspect(1); // 璐存爣鎴愬姛
wrkDetl.setIoTime(now);
wrkDetl.setAppeTime(now);
@@ -446,14 +450,20 @@
WrkMast wrkMast = wrkMastService.selectById(wrkNo);
if (wrkMast == null) {
throw new CoolException("寮傚父鍙ｅ叆搴撲换鍔″彿鏃犱换鍔★細" + wrkNo);
- } else if (wrkMast.getLocNo() != null) {
+ } else if (wrkMast.getLocNo() != null && wrkMast.getLocNo().length() == 7) {
throw new CoolException("寮傚父鍙ｅ叆搴撳簱浣嶅凡鍒嗛厤锛�" + wrkMast.getLocNo());
}
if(!param.isTbFlag()) { //涓嬬嚎鍑哄簱
+ Config config = configService.selectConfigByCode("gzxfh" + wrkMast.getSourceStaNo());
wrkMast.setSourceStaNo(1090);
- wrkMast.setStaNo(1024); // 寮傚父涓嬬嚎榛樿鍏ュ簱绔欑偣涓�1016
+ wrkMast.setStaNo(1024); // 寮傚父涓嬬嚎榛樿鍏ュ簱绔欑偣涓�1024
+ // 鑾峰彇绯荤粺閰嶇疆锛岀湅鎴愬搧缃愯瀹屾垚鏄惁鐩存帴鍑哄埌鍙戣揣鍙�
+ 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();
}
@@ -671,6 +681,15 @@
return wrkMastService.insert(wrkMast) ? R.ok("鑷姩绌烘墭鍏ュ簱鎴愬姛,宸ヤ綔鍙�:"+wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩绌烘墭鍏ュ簱澶辫触");
}
+ // 鑷姩鍑虹┖妗�
+ @PostMapping("/autoOutEmptyBucket")
+ @ResponseBody
+ public R autoOutEmptyBucket(@RequestBody StockOutParam param){
+ log.info("鏀跺埌WCS鑷姩鍑虹┖妗舵帴鍙ｈ姹�====>>鍏ュ弬:{}", param);
+ workService.startupFullTakeStore(param, 29L);
+ return R.ok("鍑哄簱鍚姩鎴愬姛");
+ }
+
@PostMapping("auto/emptyOut/v1")
@ResponseBody
public R autoEmptyOut(@RequestBody Map<String,String> emptyPalletSite){
@@ -690,7 +709,7 @@
}
if (locMast == null) {
- return R.error("搴撳瓨娌℃湁"+type+"绫诲瀷绌烘墭鐩�");
+ return R.error("搴撳瓨娌℃湁"+type+"绫诲瀷绌烘墭鐩樻垨鏃犲彲鐢ㄥ爢鍨涙満");
}
String locNo = locMast.getLocNo();
@@ -871,7 +890,7 @@
wrkMast.setIoTime(new Date());
wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
wrkMast.setIoType(10); // 鍏ュ嚭搴撶姸鎬侊細10.绌烘澘鍏ュ簱
- wrkMast.setIoPri(13D); // 浼樺厛绾�
+ wrkMast.setIoPri(14D); // 浼樺厛绾�
wrkMast.setCrnNo(dto.getCrnNo());
wrkMast.setSourceStaNo(dto.getSourceStaNo());
wrkMast.setStaNo(dto.getStaNo());
--
Gitblit v1.9.1