From 07c572bea979dbd3ee46ec24083cb1bdcc014e3a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 05 七月 2024 13:56:50 +0800
Subject: [PATCH] 一期找库位方法修改
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 46 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 42 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 74b4ed2..a7f92b1 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -247,6 +247,7 @@
wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
wrkMast.setIoPri(reduce?13D:15D); // 浼樺厛绾э細13
wrkMast.setCrnNo(locMast.getCrnNo());
+ wrkMast.setBarcode(locMast.getBarcode());
wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
wrkMast.setSourceLocNo(dto.getLocNo()); // 婧愬簱浣�
@@ -280,7 +281,8 @@
wrkDetl.setAppeUser(userId);
wrkDetl.setModiTime(new Date());
wrkDetl.setModiUser(userId);
- wrkDetl.setMemo(detlDto.getLocDetl().getMemo());
+// wrkDetl.setMemo(detlDto.getLocDetl().getMemo());
+ wrkDetl.setMemo(String.valueOf(detlDto.getLocDetl().getQty())); // 鎬绘暟閲忥紝led鏄剧ず鐢�
wrkDetl.setQtyBox(matCode.getStr6()!=null ? matCode.getStr6() : 0);
wrkDetl.setWeight(matCode.getWeight()!=null ? matCode.getWeight() : 0);
wrkDetl.setAllWeight(matCode.getWeight()!=null ? qty*matCode.getWeight()+30 : 0);
@@ -422,6 +424,15 @@
for (String locNo : param.getLocNos()) {
// 鑾峰彇宸ヤ綔鍙�
int workNo = commonService.getWorkNo(1);
+
+ //2022-06-16 ADD, 鍑哄簱搴撲綅濡傛灉鏄繁搴撲綅1鍙疯揣鏋讹紝涓斿搴旀祬搴撲綅涔熶负D鏃讹紝鍏堝嚭娴呭簱浣�
+ if(Utils.isDeepLoc(slaveProperties, locNo)){
+ String shallow = Utils.getShallowLoc(slaveProperties,locNo);
+ LocMast shallowLoc = locMastService.selectById(shallow);
+ if(!Cools.isEmpty(shallowLoc) && shallowLoc.getLocSts().equals("D")){
+ locNo = shallowLoc.getLocNo();
+ }
+ }
// 鑾峰彇搴撲綅
LocMast locMast = locMastService.selectById(locNo);
@@ -806,7 +817,11 @@
locSts = "D";
// 搴撲綅杞Щ ===>> D.绌烘《/绌烘爤鏉�
} else if (wrkMast.getIoType() == 11) {
- locSts = "F";
+ if(wrkMast.getEmptyMk().equals("Y")){
+ locSts = "D";
+ }else {
+ locSts = "F";
+ }
// 搴撲綅杞Щ锛氱洰鏍囧簱浣�
LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
if (Cools.isEmpty(locMast)) {
@@ -836,7 +851,7 @@
if (wrkMast.getIoType() != 10 && wrkMast.getIoType() != 110) {
// 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
- if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
+ if (!wrkMast.getEmptyMk().equals("Y") && !wrkDetlLogService.save(wrkMast.getWrkNo())) {
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗ｅけ璐�, workNo = " + wrkMast.getWrkNo());
}
// 鍒犻櫎宸ヤ綔妗ｆ槑缁�
@@ -879,10 +894,33 @@
if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
throw new CoolException("淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗ｅけ璐�");
}
+ // 鎷ｃ�佺洏銆佸苟 浣滀笟绔欒浆鎹�
+ int stnNo = 0;
+ if (wrkMast.getIoType() == 103) { // 鎷ｆ枡鍑哄簱
+ if(wrkMast.getCrnNo() == 1) {
+ stnNo = 104;
+ }else if(wrkMast.getCrnNo() == 2) {
+ stnNo =204;
+ }else if(wrkMast.getCrnNo() == 3) {
+ stnNo = 304;
+ }
+ } else if(wrkMast.getIoType() == 107){ //鐩樼偣鍑哄簱
+ if(wrkMast.getCrnNo() == 1) {
+ stnNo = 101;
+ }else if(wrkMast.getCrnNo() == 2) {
+ stnNo =201;
+ }else if(wrkMast.getCrnNo() == 3) {
+ stnNo = 301;
+ }
+ }
+ if (stnNo == 0) {
+ log.error("{}鍙蜂换鍔℃暟鎹紓甯革紒", wrkMast.getWrkNo());
+ throw new CoolException("鍐嶅叆搴撶珯鐐规湁璇�");
+ }
// 鑾峰彇鐩爣绔�
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
.eq("type_no", wrkMast.getIoType() - 50)
- .eq("stn_no", wrkMast.getStaNo()) // 浣滀笟绔欑偣 = 鎷ｆ枡鍑哄簱鐨勭洰鏍囩珯
+ .eq("stn_no", stnNo) // 浣滀笟绔欑偣 = 鎷ｆ枡鍑哄簱鐨勭洰鏍囩珯
.eq("crn_no", wrkMast.getCrnNo()); // 鍫嗗灈鏈哄彿
StaDesc staDesc = staDescService.selectOne(wrapper);
if (Cools.isEmpty(staDesc)) {
--
Gitblit v1.9.1