From 8ac14b7579587a35476e6892f9a2b1ee90a78957 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 21 七月 2023 14:42:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 37 ++++++++++++++++++++++++++++++-------
1 files changed, 30 insertions(+), 7 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 4ad0aca..4918ab6 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -1,6 +1,7 @@
package com.zy.asrs.service.impl;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.BaseRes;
@@ -171,6 +172,7 @@
List<String> groupOuterSingleLoc = Utils.getGroupOuterSingleLoc(locDetl.getLocNo());
for (String locNo : groupOuterSingleLoc) {
//姣忎釜搴撲綅鐨勫簱浣嶆槑缁�
+ if(locs.contains(locNo)) continue;
for (LocDetl detl : locDetlService.selectByLocNo(locNo)) {
if (!detl.getMatnr().equals(locDetl.getMatnr())) {
//涓嶆槸鐩稿悓鐗╂枡
@@ -446,6 +448,7 @@
@Override
@Transactional
public void stockOut(BasDevp staNo, List<LocDetlDto> locDetlDtos, IoWorkType ioWorkType, Long userId) {
+ Integer basDevp = staNo.getDevNo();
Date now = new Date();
// 鍚堝苟鍚岀被椤�
Set<String> locNos = new HashSet<>();
@@ -572,6 +575,10 @@
if (Cools.isEmpty(mat)) {
throw new CoolException(locDetl.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
}
+ int zpallet = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", locDetl.getZpallet()));
+ if (zpallet>0) {
+ throw new CoolException(locDetl.getZpallet() + "鍏ュ簱閫氱煡妗ｄ腑宸插瓨鍦�");
+ }
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
waitPakin.setBatch("");
@@ -623,13 +630,27 @@
//-----------------2023.6.2鍑哄簱鍏煎浠ｇ爜-----------------------
if (ioType!=107){
List<LocDetl> locDetls = locDetlService.selectByLocNo(locMast.getLocNo());
- if (locMast.getLocType2() == 1 && locDetls.size() > 1) {
- //鍗曞搧鍖哄煙鍑哄簱鐗╂枡澶т簬1绉嶏紝寮哄埗鍙樻垚101鍏ㄦ澘鍑哄簱
- ioType = 101;
+ //if (locMast.getLocType2() == 1 && locDetls.size() > 1) {
+ // //鍗曞搧鍖哄煙鍑哄簱鐗╂枡澶т簬1绉嶏紝寮哄埗鍙樻垚101鍏ㄦ澘鍑哄簱
+ // ioType = 101;
+ // if (staNo.getDevNo()==300){
+ // staNo.setDevNo(200);
+ // }
+ //}
+ if (ioType == 101) {
if (staNo.getDevNo()==300){
- staNo.setDevNo(200);
+ if(locMast.getCrnNo() == 1) {
+ staNo.setDevNo(100);
+ } else {
+ staNo.setDevNo(200);
+ }
+
}
+ } else {
+ staNo.setDevNo(basDevp);
}
+
+
}
//-----------------2023.6.2鍑哄簱鍏煎浠ｇ爜end-----------------------
@@ -1011,9 +1032,9 @@
@Override
@Transactional
public void locCheckOut(StockOutParam param, Long userId) {
- if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 107)) > 0) {
- throw new CoolException("鍙兘瀛樺湪涓�绗旂洏鐐逛换鍔�");
- }
+// if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 107)) > 0) {
+// throw new CoolException("鍙兘瀛樺湪涓�绗旂洏鐐逛换鍔�");
+// }
// 鐩爣绔欑偣鐘舵�佹娴�
BasDevp staNo = basDevpService.checkSiteStatus(param.getOutSite());
// 鑾峰彇搴撲綅鏄庣粏
@@ -1417,6 +1438,8 @@
if (!wrkMastRes || !locMastRes) {
throw new CoolException("淇濆瓨鏁版嵁澶辫触");
}
+ WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()));
+ waitPakinService.delete(new EntityWrapper<>(waitPakin));
}
@Override
--
Gitblit v1.9.1