From e9bf533bc284fc9f7b7fa02b89679c33773bd0cb Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 18 七月 2025 10:39:40 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/WorkService.java | 2
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 122 ----------------------------------------
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 11 ---
3 files changed, 0 insertions(+), 135 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/WorkService.java b/src/main/java/com/zy/asrs/service/WorkService.java
index 148b496..afc2d23 100644
--- a/src/main/java/com/zy/asrs/service/WorkService.java
+++ b/src/main/java/com/zy/asrs/service/WorkService.java
@@ -102,6 +102,4 @@
void turnMatLocDetl(EmptyPlateOutParam param, Long userId);
- void adjustLocDetl2(LocDetlAdjustParam param, Long userId);
-
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 9eec423..4586a4a 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -837,10 +837,6 @@
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
List<WrkDetl> list = JSON.parseArray(JSON.toJSONString(param.getWrkDetls()), WrkDetl.class);
- LocDetlAdjustParam adjustParam = new LocDetlAdjustParam();
- List<LocDetlAdjustParam.LocDetlAdjust> locDetlAdjusts = new ArrayList<>();
-
- adjustParam.setLocNo(wrkMast.getSourceLocNo());
// 淇敼鏁伴噺
Iterator<WrkDetl> iterator = wrkDetls.iterator();
while (iterator.hasNext()) {
@@ -892,11 +888,6 @@
throw new CoolException("娣诲姞" + wrkMast.getWrkNo() + "鐩樼偣浠诲姟锛�" + wrkDetl.getMatnr() + "鍟嗗搧锛�" + wrkDetl.getBatch() + "鎵瑰彿浠诲姟鏄庣粏澶辫触");
}
}
- List<WrkDetl> wrkDetls1 = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
- for (WrkDetl wrkDetl : wrkDetls1) {
- LocDetlAdjustParam.LocDetlAdjust locDetlAdjust = new LocDetlAdjustParam.LocDetlAdjust(wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme());
- locDetlAdjusts.add(locDetlAdjust);
- }
List<WrkDetl> paramWrkDetls = JSON.parseArray(JSON.toJSONString(param.getWrkDetls()), WrkDetl.class);
for (WrkDetl wrkDetl : paramWrkDetls) {
@@ -921,8 +912,6 @@
if (!wrkMastService.updateById(wrkMast)) {
throw new CoolException("淇敼鐩樼偣浠诲姟涓绘。澶辫触");
}
- adjustParam.setList(locDetlAdjusts);
- workService.adjustLocDetl2(adjustParam, userId);
}
@Override
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 48ded12..17b0c6b 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -1151,128 +1151,6 @@
@Override
@Transactional
- public void adjustLocDetl2(LocDetlAdjustParam param, Long userId) {
- param.integrate();
- LocMast locMast = locMastService.selectById(param.getLocNo());
- if (Cools.isEmpty(locMast)) {
- throw new CoolException("搴撲綅涓嶅瓨鍦�");
- }
- if (!(locMast.getLocSts().equals("P"))) {
- throw new CoolException("褰撳墠搴撲綅涓嶅彲璋冩暣锛佸簱浣嶇姸鎬侊細" + locMast.getLocSts$());
- }
-
- Date now = new Date();
- List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", param.getLocNo()));
-
- List<LocDetlAdjustParam.LocDetlAdjust> list = param.getList();
-
- // 娣诲姞鍘嗗彶宸ヤ綔涓绘。
- WrkMastLog wrkMast = new WrkMastLog();
- wrkMast.setIoTime(now);
- wrkMast.setWrkSts(5);
- wrkMast.setIoPri(13D); // 浼樺厛绾�
- wrkMast.setCrnNo(locMast.getCrnNo());
- wrkMast.setSourceLocNo(locMast.getLocNo());
- wrkMast.setLocNo(locMast.getLocNo());
- wrkMast.setBarcode(locMast.getBarcode()); // 鎵樼洏鐮�
- wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
- wrkMast.setPicking("N"); // 鎷ｆ枡
- wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setEmptyMk("N"); // 绌烘澘
- wrkMast.setLinkMis("Y");
- // 鎿嶄綔浜哄憳鏁版嵁
- wrkMast.setAppeTime(now);
- wrkMast.setModiTime(now);
- wrkMast.setAppeUser(userId);
- wrkMast.setModiUser(userId);
-
- // 澧炲垹鏀瑰彧鍒涘缓涓�娆″伐浣滀富妗�
- boolean updateFlag = true;
-
- // 淇敼鏁伴噺
- Iterator<LocDetl> iterator = locDetls.iterator();
- while (iterator.hasNext()) {
- LocDetl locDetl = iterator.next();
-
- Iterator<LocDetlAdjustParam.LocDetlAdjust> iterator1 = list.iterator();
- while (iterator1.hasNext()) {
- LocDetlAdjustParam.LocDetlAdjust adjust = iterator1.next();
- if (adjust.getCount() == 0) {
- continue;
- }
- if (locDetl.getMatnr().equals(adjust.getMatnr()) && Cools.eq(locDetl.getBatch(), adjust.getBatch())) {
- if (!locDetl.getAnfme().equals(adjust.getCount())) {
- // todo 鐩樼偣璁板綍
- // 淇敼搴撳瓨
- if (!locDetlService.updateAnfme(adjust.getCount(), locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getBatch(), locDetl.getBrand(),
- locDetl.getStandby1(), locDetl.getStandby2(), locDetl.getStandby3(), locDetl.getBoxType1(), locDetl.getBoxType2(), locDetl.getBoxType3())) {
- throw new CoolException(locDetl.getLocNo() + "搴撲綅锛�" + locDetl.getMatnr() + "鍟嗗搧锛�" + locDetl.getBatch() + "鎵瑰彿淇敼鏁伴噺澶辫触");
- }
- // 淇濆瓨璋冩暣璁板綍
- AdjDetl adjDetl = new AdjDetl();
- adjDetl.setLocNo(locDetl.getLocNo());
- adjDetl.setMatnr(locDetl.getMatnr());
- adjDetl.setBatch(locDetl.getBatch());
- adjDetl.setOriQty(locDetl.getAnfme());
- adjDetl.setAdjQty(adjust.getCount());
- adjDetl.setModiTime(now);
- adjDetl.setModiUser(userId);
- adjDetl.setAppeTime(now);
- adjDetl.setAppeUser(userId);
- adjDetlService.save(adjDetl, userId);
-
- if (updateFlag) {
- wrkMast.setWrkNo(commonService.getWorkNo(3));
- wrkMast.setIoType(23);
- boolean res = wrkMastLogService.insert(wrkMast);
- if (!res) {
- throw new CoolException("搴撳瓨璋冩暣-淇敼 淇濆瓨宸ヤ綔妗ｅけ璐�");
- }
- updateFlag = false;
- }
-
- // 娣诲姞鍘嗗彶宸ヤ綔鏄庣粏
- WrkDetlLog wrkDetl = new WrkDetlLog();
- wrkDetl.sync(locDetl);
- wrkDetl.setWrkNo(wrkMast.getWrkNo());
- wrkDetl.setIoTime(wrkMast.getIoTime());
- wrkDetl.setAnfme(adjust.getCount());
- wrkDetl.setAppeTime(now);
- wrkDetl.setModiTime(now);
- wrkMast.setAppeUser(userId);
- wrkMast.setModiUser(userId);
- if (!wrkDetlLogService.insert(wrkDetl)) {
- throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
- }
- }
- iterator.remove();
- iterator1.remove();
- }
- }
- }
-
- // 淇敼搴撲綅鐘舵��
- int count = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
- if (locMast.getLocSts().equals("F")) {
- if (count == 0) {
- locMast.setLocSts("D");
- }
- }
- if (locMast.getLocSts().equals("D") || locMast.getLocSts().equals("O")) {
- if (count > 0) {
- locMast.setLocSts("F");
- }
- }
- locMast.setModiUser(userId);
- locMast.setModiTime(now);
- if (!locMastService.updateById(locMast)) {
- throw new CoolException("鏇存柊搴撲綅鐘舵�佸け璐�");
- }
- }
-
-
- @Override
- @Transactional
public void cancelWrkMast(String workNo, Long userId) {
Date now = new Date();
WrkMast wrkMast = wrkMastService.selectById(workNo);
--
Gitblit v1.9.1