From 055743022694b6fc1bb1864137e0c81b6ea658c5 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期四, 29 一月 2026 19:45:26 +0800
Subject: [PATCH] 盘点出库增加一个标记 可筛选可清除
---
src/main/java/com/zy/common/web/WcsController.java | 163 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 155 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 3522907..7141eab 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -1,7 +1,6 @@
package com.zy.common.web;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
@@ -9,15 +8,17 @@
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.result.FindLocNoAttributeVo;
import com.zy.asrs.service.*;
+import com.zy.asrs.utils.Utils;
import com.zy.common.CodeRes;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.StartupDto;
+import com.zy.common.properties.SlaveProperties;
import com.zy.common.service.CommonService;
import com.zy.common.web.param.SearchLocParam;
+import com.zy.common.web.param.TransferLocParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
@@ -54,6 +55,8 @@
private WrkMastLogService wrkMastLogService;
@Autowired
private WrkDetlLogService wrkDetlLogService;
+ @Autowired
+ private SlaveProperties slaveProperties;
@PostMapping("/pakin/loc/v1")
@ResponseBody
@@ -135,9 +138,30 @@
return R.error("鎵樼洏鐮佷笉瀛樺湪");
}
- startupPickPutStore(param);
+ StartupDto dto = startupPickPutStore(param);
log.info("WCS鎷ｆ枡鐩樼偣鍏ュ簱鎺ュ彛,鎵樼洏鐮�:{}", param.getBarcode());
- return R.ok();
+ return R.ok().add(dto);
+ }
+
+ @PostMapping("/transfer/loc/v1")
+ @ResponseBody
+ public synchronized R transferLocV1(@RequestBody TransferLocParam param) {
+ log.info("鏀跺埌WCS鐢宠绉诲簱鎺ュ彛璇锋眰====>>鍏ュ弬:{}", param);
+ if (Cools.isEmpty(param.getLocNo())) {
+ return R.error("搴撲綅鍙蜂笉瀛樺湪");
+ }
+
+ if (Cools.isEmpty(param.getLane())) {
+ return R.error("宸烽亾鍙蜂笉瀛樺湪");
+ }
+
+ try {
+ transferLoc(param.getLocNo(), param.getLane());
+ return R.ok();
+ } catch (Exception e) {
+ e.printStackTrace();
+ return R.error(e.getMessage());
+ }
}
@PostMapping("/auto/emptyIn/v1")
@@ -193,7 +217,7 @@
}
@Transactional
- public void startupPickPutStore(SearchLocParam param) {
+ public StartupDto startupPickPutStore(SearchLocParam param) {
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.selectById(param.getSourceStaNo());
sourceStaNo.setLocType1(param.getLocType1());
@@ -214,7 +238,10 @@
}
if (wrkMast.getIoType() == 53 || wrkMast.getIoType() == 57) {
- throw new CoolException(wrkMast.getWrkNo() + "宸ヤ綔鍙凤紝浠诲姟宸茬粡鎷ｉ�夌洏鐐�");
+ StartupDto dto = new StartupDto();
+ dto.setWorkNo(wrkMast.getWrkNo());
+ dto.setStaNo(wrkMast.getStaNo());
+ return dto;
}
if (wrkMast.getIoType() != 103 && wrkMast.getIoType() != 107) {
@@ -257,6 +284,9 @@
wrkMast.setLocNo(dto.getLocNo());
wrkMast.setBarcode(param.getBarcode()); // 鎵樼洏鐮�
wrkMast.setModiTime(now);
+ if(wrkMast.getIoType()==57){
+ wrkMast.setMk("Y");
+ }
wrkMast.setUpdMk("");//鍏佽鍐嶆绉诲簱
if (!wrkMastService.updateById(wrkMast)) {
throw new CoolException("鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
@@ -267,18 +297,23 @@
throw new CoolException(locMast.getLocNo() + "搴撲綅鐘舵�佷笉澶勪簬绌哄簱浣�");
}
- locMast.setLocSts("S");
+ // 淇敼搴撲綅鐘舵�� Q.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴�
+ locMast.setLocSts("Q");
+ locMast.setMk(wrkMast.getMk());
locMast.setModiTime(new Date());
if (!locMastService.updateById(locMast)) {
throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
}
- // 淇敼搴撲綅鐘舵�� Q.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴�
LocMast sourceLocMast = locMastService.selectById(wrkMast.getSourceLocNo());
if (!sourceLocMast.getLocSts().equals("P")) {
throw new CoolException(sourceLocMast.getLocNo() + "搴撲綅鐘舵�佷笉澶勪簬P.鎷ｆ枡鐩樼偣鍑哄簱");
}
+// locMast.setMk(sourceLocMast.getMk());
+// if (!locMastService.updateById(locMast)) {
+// throw new CoolException("淇敼鏄惁鐩樼偣鐘舵�佸け璐�");
+// }
//鑾峰彇婧愬簱瀛樹俊鎭苟杩佺Щ鑷虫柊搴撲綅
List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
.eq("loc_no", sourceLocMast.getLocNo()));
@@ -303,6 +338,8 @@
// 淇敼婧愬簱浣嶇姸鎬� P ===>> O
if (sourceLocMast.getLocSts().equals("P")) {
sourceLocMast.setLocSts("O");
+ //鏇存崲鐩樼偣鏍囪涓篘
+ sourceLocMast.setMk("N");
sourceLocMast.setBarcode("");
sourceLocMast.setModiTime(now);
sourceLocMast.setIoTime(now);
@@ -311,6 +348,7 @@
}
}
+ return dto;
}
/**
@@ -460,4 +498,113 @@
return dto;
}
+ @Transactional
+ public synchronized void transferLoc(String sourceLocNo, Integer lane) {
+ LocMast sourceLocMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", sourceLocNo));
+ if (sourceLocMast == null) {
+ throw new CoolException(sourceLocNo + "婧愬簱浣嶄笉瀛樺湪");
+ }
+
+ if (!(sourceLocMast.getLocSts().equals("F") || sourceLocMast.getLocSts().equals("D"))) {
+ throw new CoolException(sourceLocNo + "婧愬簱浣嶇姸鎬佷笉澶勪簬鍦ㄥ簱");
+ }
+
+ List<Integer> rows = locMastService.selectRowByCrnNo(sourceLocMast.getCrnNo());
+ LocMast transferLoc = null;
+ for (Integer row : rows) {
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("row1", row)
+ .eq("loc_type1", sourceLocMast.getLocType1())
+ .eq("loc_sts", "O")
+ );
+ for (LocMast locMast : locMasts) {
+ if (sourceLocMast.getCrnNo() == 1) {
+ if (Utils.getLaneByLocNo(locMast.getLocNo()) != lane) {
+ continue;
+ }
+ }
+
+ if (Utils.isDeepLoc(slaveProperties, locMast.getLocNo())) {
+ String shallowLocNo = Utils.getShallowLoc(slaveProperties, locMast.getLocNo());
+ LocMast shallowLoc1 = locMastService.selectById(shallowLocNo);
+ if (!shallowLoc1.getLocSts().equals("O")) {
+ continue;
+ }
+ }
+
+ transferLoc = locMast;
+ break;
+ }
+
+ if (null != transferLoc) {
+ break;
+ }
+ }
+
+ if (transferLoc == null) {
+ throw new CoolException(sourceLocNo + "搴撲綅绉昏浆澶辫触锛屾湭鎵惧埌绌哄簱浣�");
+ }
+
+ // 鑾峰彇宸ヤ綔鍙�
+ int workNo = commonService.getWorkNo(0);
+ // 淇濆瓨宸ヤ綔妗�
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(workNo);
+ wrkMast.setIoTime(new Date());
+ wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
+ wrkMast.setIoType(11); // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
+ wrkMast.setIoPri(13D);
+ wrkMast.setCrnNo(transferLoc.getCrnNo());
+ wrkMast.setSourceLocNo(sourceLocMast.getLocNo()); // 婧愬簱浣�
+ wrkMast.setLocNo(transferLoc.getLocNo()); // 鐩爣搴撲綅
+ wrkMast.setFullPlt(sourceLocMast.getLocSts().equals("D") ? "N" : "Y"); // 婊℃澘
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk(sourceLocMast.getLocSts().equals("D") ? "Y" : "N"); // 绌烘澘
+ wrkMast.setBarcode(sourceLocMast.getBarcode()); // 鎵樼洏鐮�
+ wrkMast.setLinkMis("N");
+ wrkMast.setAppeTime(new Date());
+ wrkMast.setModiTime(new Date());
+ boolean res = wrkMastService.insert(wrkMast);
+ if (!res) {
+ throw new CoolException(sourceLocNo + "搴撲綅绉昏浆澶辫触锛岀敓鎴愬簱浣嶇Щ杞伐浣滄。澶辫触");
+ }
+
+ // 宸ヤ綔妗ｆ槑缁嗕繚瀛�
+ if (sourceLocMast.getLocSts().equals("F")) {
+ List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", sourceLocMast.getLocNo()));
+
+ for (LocDetl locDetl : locDetls) {
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(locDetl);
+ wrkDetl.setWrkNo(workNo);
+ wrkDetl.setIoTime(new Date());
+ wrkDetl.setAnfme(locDetl.getAnfme());
+ wrkDetl.setAppeTime(new Date());
+ wrkDetl.setModiTime(new Date());
+ if (!wrkDetlService.insert(wrkDetl)) {
+ throw new CoolException(sourceLocNo + "搴撲綅绉昏浆澶辫触锛岀敓鎴愬簱浣嶇Щ杞伐浣滄槑缁嗘。澶辫触");
+ }
+ }
+ }
+
+ // 淇敼婧愬簱浣嶇姸鎬�
+ if (sourceLocMast.getLocSts().equals("D") || sourceLocMast.getLocSts().equals("F")) {
+ sourceLocMast.setLocSts("R"); // R.鍑哄簱棰勭害
+ sourceLocMast.setModiTime(new Date());
+ if (!locMastService.updateById(sourceLocMast)) {
+ throw new CoolException(sourceLocNo + "搴撲綅绉昏浆澶辫触锛屾洿鏂版簮搴撲綅鐘舵�佸け璐�");
+ }
+ }
+
+ // 淇敼鐩爣搴撲綅鐘舵��
+ if (transferLoc.getLocSts().equals("O")) {
+ transferLoc.setLocSts("S"); // S.鍏ュ簱棰勭害
+ transferLoc.setModiTime(new Date());
+ if (!locMastService.updateById(transferLoc)) {
+ throw new CoolException(sourceLocNo + "搴撲綅绉昏浆澶辫触锛屾洿鏂扮洰鏍囧簱浣嶇姸鎬佸け璐�");
+ }
+ }
+ }
+
}
--
Gitblit v1.9.1