From b7d562f09526fc5d1fddc3a692f47aeb3ac956f6 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 28 四月 2026 04:09:14 +0800
Subject: [PATCH] #退库优化/自动跨巷道移库V1
---
src/main/java/com/zy/common/web/WcsController.java | 149 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 134 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 607bd5b..90c6325 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -62,6 +62,7 @@
@PostMapping("/pakin/loc/v1")
@ResponseBody
public synchronized R getLocNo(@RequestBody SearchLocParam param) {
+ StartupDto dto = null;
log.info("鏀跺埌WCS鍏ュ簱鎺ュ彛璇锋眰====>>鍏ュ弬:{}", param);
if (Cools.isEmpty(param.getIoType())) {
return R.error("鍏ュ嚭搴撶被鍨嬩笉鑳戒负绌�");
@@ -70,12 +71,13 @@
return R.error("婧愮珯缂栧彿涓嶈兘涓虹┖");
}
List<WaitPakin> waitPakins = null;
- if (param.getIoType() == 1) {
+ WrkMast wrkMastV2 = null;
+ if (param.getIoType() == 1 && !param.getSourceStaNo().equals(1070)) {
//澶勭悊鎵樼洏鐮�
//3S19000677895,M22003772,3 ,KP, 0A2030 ,0A2030202306050023
//3S绠辩爜鍙� ,绔瓙鐗╂枡鍙� ,鏁伴噺,鍗曚綅,渚涘簲鍟嗙紪鍙�,渚涘簲鍟嗘壒娆″彿
//鏁伴噺鍜岄噸閲忚浆鎹㈠嚭鏉ョ殑鏄惁宸笉澶�
- //weight 涓� 43.39 鍘荤毊2.35 = 41.05
+ //weight 涓� 43.39 鍘荤毊2.45 = 40.95
//鎵樼洏鐮佷緥瀛� 845000820308,M11000787,1000,MT,0A1263,0A126320260120
//鎹㈢畻闇�瑕�41.05*24.36绾︾瓑浜�1000
if (Cools.isEmpty(param.getBarcode())) {
@@ -91,8 +93,22 @@
String threeCode = param.getBarcode();
param.setBarcode(barcode);
//瀹為檯绉伴噸鏁伴噺
- Double m = param.getWeight() -2.35;
+ Double m = param.getWeight() -2.4;
+
+ WrkMast wrkMast1 = wrkMastService.selectByBarcode(barcode);
+ if (!Cools.isEmpty(wrkMast1)&&wrkMast1.getWrkSts()==2) {
+ StartupDto dto1 =new StartupDto();
+ dto1.setBarcode(barcode);
+ dto1.setSourceStaNo(Integer.valueOf(wrkMast1.getSourceStaNo()));
+ dto1.setStaNo(Integer.valueOf(wrkMast1.getStaNo()));
+ String s = Utils.WMSLocToWCSLoc(wrkMast1.getLocNo());
+ dto1.setLocNo(s);
+ dto1.setCrnNo(wrkMast1.getCrnNo());
+ dto1.setTaskNo(wrkMast1.getWrkNo());
+ dto1.setTaskPri((int) Math.round(wrkMast1.getIoPri()));
+ return R.ok(dto1);
+ }
Mat mat = matService.selectByMatnr(matnr);
if(mat==null){
log.info("娌℃湁鎵惧埌璇ョ墿鏂欐。妗�--"+matnr+"缁勬墭鏃惰嚜鍔ㄦ柊澧炵墿鏂欙紝榛樿24.36KG/M");
@@ -110,17 +126,26 @@
}
m=m*mat.getVolume();
- //Double val = Math.round((m - matnr.getSafeQty()) * 10000) / 10000.0;
- Config config = configService.selectConfigByCode("SimulationInbound");
- if (config != null && config.getValue().equals("Y")) {
- WaitPakin waitPakin1 = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
- if (Cools.isEmpty(waitPakin1)) {
- WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("io_status", "N"));
- if (waitPakin != null) {
- waitPakinService.updateForSet("zpallet = '" + param.getBarcode() + "'", new EntityWrapper<WaitPakin>().eq("zpallet", waitPakin.getZpallet()));
- }
- }
+ Double currentStock = locDetlService.getSumAnfme(matnr);
+ if (currentStock == null) {
+ currentStock = 0D;
}
+ if (mat.getStoreMax() != null && currentStock + m > mat.getStoreMax()) {
+ log.info("WCS鍏ュ簱鎷︽埅: 鐗╂枡瓒呰繃搴撳瓨涓婇檺, matnr={}, currentStock={}, inboundQty={}, storeMax={}",
+ matnr, currentStock, m, mat.getStoreMax());
+ return R.error("鐗╂枡宸插埌杈句笂闄愮姝㈠叆搴�");
+ }
+ //Double val = Math.round((m - matnr.getSafeQty()) * 10000) / 10000.0;
+// Config config = configService.selectConfigByCode("SimulationInbound");
+// if (config != null && config.getValue().equals("Y")) {
+// WaitPakin waitPakin1 = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
+// if (Cools.isEmpty(waitPakin1)) {
+// WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("io_status", "N"));
+// if (waitPakin != null) {
+// waitPakinService.updateForSet("zpallet = '" + param.getBarcode() + "'", new EntityWrapper<WaitPakin>().eq("zpallet", waitPakin.getZpallet()));
+// }
+// }
+// }
waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
if (Cools.isEmpty(waitPakins)) {
WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
@@ -132,6 +157,7 @@
waitPakin.setZpallet(param.getBarcode());
waitPakin.setAnfme(m);
waitPakin.setThreeCode(threeCode);
+ waitPakins.add(waitPakin);
waitPakinService.insert(waitPakin);
}else {
for(WaitPakin waitPakin : waitPakins){
@@ -148,7 +174,9 @@
if(Cools.isEmpty(waitPakin.getBeBatch())||waitPakin.getBeBatch()!=1){
flag = true;
}
- if (flag && (weight - m < -2.0 || weight - m > 2.0)) {
+ //2.5KG * 姣忓叕鏂ら暱搴� = 璇樊鍊�
+ Double dou= 2.5*mat.getVolume();
+ if (flag && (weight - m < -dou || weight - m > dou)) {
return R.error("浜岀淮鐮�="+threeCode+"鐨勭墿鏂欏疄闄呯О閲嶈浆鎹㈡垚鐨勭背鏁板拰鐗╂枡鏍囩鎻愪緵鐨勭背鏁扮浉宸緝澶ч渶瑕侀��鍥炴垨鑰呮爣璁板悗鎵嶈兘鍏ュ簱锛�");
}
@@ -156,6 +184,18 @@
int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
if (countLoc > 0 || countWrk > 0) {
return R.error(CodeRes.EXIST_500);
+ }
+ }else if(param.getIoType() != 10){
+ //barcode鏀剧潃wms宸ヤ綔鍙风敤浜庢绱换鍔℃。
+ wrkMastV2 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no",param.getBarcode()));
+ if (wrkMastV2 == null) {
+ return R.error("1070绔欑偣wms宸ヤ綔鍙蜂负绌�");
+ }
+ if(wrkMastV2.getIsSuplus().equals(0)){//鑻ヤ负绌烘澘鍥炲簱锛岃繘鍏ョ┖鏉垮叆搴撴祦绋�
+ param.setIoType(10);
+ param.setBarcode(wrkMastV2.getBarcode());
+ }else{ //鑻ヤ负浣欐枡
+ param.setIoType(1070);
}
}
if (Cools.isEmpty(param.getLocType1())){
@@ -167,7 +207,6 @@
sourceStaNo.setLocType1(param.getLocType1());
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
- StartupDto dto = null;
switch (param.getIoType()) {
case 1://婊℃墭鐩樺叆搴�
assert waitPakins != null;
@@ -175,6 +214,9 @@
break;
case 10://绌烘墭鐩樺叆搴�
dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode());
+ break;
+ case 1070:
+ dto = startupFullPutStoreV2(param.getSourceStaNo(), wrkMastV2, locTypeDto);//1070
break;
default:
break;
@@ -323,6 +365,80 @@
return dto;
}
+
+ @Transactional
+ public StartupDto startupFullPutStoreV2(Integer devpNo, WrkMast wrkMast, LocTypeDto locTypeDto) {
+ // 婧愮珯鐐圭姸鎬佹娴�
+ BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
+ StartupDto dto = commonService.getLocNoV2( 1, devpNo,wrkMast, locTypeDto);
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ if (Cools.isEmpty(dto)) {
+ throw new CoolException("娌℃湁鎵惧埌搴撲綅");
+ }
+ if (Cools.isEmpty(wrkDetls)) {
+ throw new CoolException("宸ヤ綔鏄庣粏涓嶅瓨鍦�");
+ }
+ int workNo = dto.getWorkNo();
+ Date now = new Date();
+ // 鐢熸垚宸ヤ綔妗�
+ wrkMast.setWrkNo(workNo);
+ wrkMast.setIoTime(new Date());
+ wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
+ wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
+ wrkMast.setIoPri(13D); // 浼樺厛绾�
+ wrkMast.setCrnNo(dto.getCrnNo());
+ wrkMast.setSourceStaNo(dto.getSourceStaNo() + "");//1070
+ wrkMast.setStaNo(dto.getStaNo() + "");
+ wrkMast.setLocNo(dto.getLocNo());
+ wrkMast.setBarcode(wrkDetls.get(0).getZpallet()); // 鎵樼洏鐮�
+ wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMast.setOnlineYn("Y");
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("N"); // 绌烘澘
+ wrkMast.setLinkMis("Y");
+ wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
+ // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiTime(now);
+ boolean res = wrkMastService.insert(wrkMast);
+ if (!res) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ }
+ for (WrkDetl srcDetl : wrkDetls) {
+ WrkDetl newDetl = new WrkDetl();
+ newDetl.sync(srcDetl);
+ newDetl.setWrkNo(wrkMast.getWrkNo());
+ newDetl.setIoTime(wrkMast.getIoTime());
+ newDetl.setAppeTime(now);
+ newDetl.setModiTime(now);
+ if (!wrkDetlService.insert(newDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+ }
+ }
+ // 鏇存柊婧愮珯鐐逛俊鎭�
+ sourceStaNo.setWrkNo(workNo);
+ sourceStaNo.setModiTime(now);
+ if (!basDevpService.updateById(sourceStaNo)){
+ throw new CoolException("鏇存柊婧愮珯澶辫触");
+ }
+ // 鏇存柊鐩爣搴撲綅鐘舵��
+ LocMast locMast = locMastService.selectById(dto.getLocNo());
+ if (locMast.getLocSts().equals("O")){
+ locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
+ locMast.setModiTime(now);
+ if (!locMastService.updateById(locMast)){
+ throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
+ }
+ } else {
+ throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
+ }
+ dto.setBarcode(wrkMast.getBarcode());
+ dto.setTaskNo(wrkMast.getWrkNo());
+ dto.setTaskPri(wrkMast.getIoPri().intValue());
+ return dto;
+ }
+
@Transactional
public StartupDto emptyPlateIn(Integer devpNo, LocTypeDto locTypeDto, String barcode) {
// 婧愮珯鐐圭姸鎬佹娴�
@@ -331,6 +447,9 @@
FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
StartupDto dto = commonService.getLocNo( 10, devpNo, findLocNoAttributeVo, locTypeDto);
+ if(Cools.isEmpty(dto)){
+ throw new CoolException("鏈绱㈠埌搴撲綅");
+ }
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
--
Gitblit v1.9.1