From d54bd5c604ce8fba95b9c5ba55213b95100c6aa3 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期四, 24 四月 2025 09:59:17 +0800
Subject: [PATCH] 初步完成调试
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 71 ++++++++++++++++++++++-------------
1 files changed, 44 insertions(+), 27 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 fffc622..237d191 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -181,6 +181,9 @@
if (!locDetlDtos.isEmpty()) {
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetlDtos.get(0).getLocDetl().getLocNo()));
if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D")) {
+ if (staNo.getDevNo() == 1135 && locMast.getLocType1() == 2) {
+ throw new CoolException("鎵�閫夊簱浣嶄笉鏄綆搴撲綅鏃犳硶璋冩嫧锛屽簱浣嶅彿锛歿}" + locMast.getLocNo());
+ }
// 鍚姩鍑哄簱寮�濮� 101.鍑哄簱
stockOut(staNo, locDetlDtos, null, userId);
} else {
@@ -228,6 +231,11 @@
LocMast locMast = locMastService.selectById(dto.getLocNo());
Integer outSta = staNo.getDevNo();
+ if (outSta == 1135 || outSta == 1031) {
+ if (101 != ioType) {
+ throw new CoolException("璇ョ珯鐐瑰繀椤诲叏鏉垮嚭搴擄紝鍑哄簱搴撲綅鍙凤細" + dto.getLocNo());
+ }
+ }
// //2鍙峰爢鍨涙満鍏ㄦ澘鍑哄簱绔欐寚瀹氫负204绔欙紝鎷ｆ枡绔欐寚瀹氫负202
// if(locMast.getCrnNo()==2){
// outSta = ioType == 101 ? 204 : 202;
@@ -1876,9 +1884,11 @@
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(workNo);
wrkMast.setIoTime(new Date());
- wrkMast.setWrkSts(1L); // 宸ヤ綔鐘舵�侊細1.鐢熸垚鍏ュ簱ID
- wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細 1.搴撴牸绉昏浇
+ wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細1.鐢熸垚鍏ュ簱ID
+ wrkMast.setIoType(wrkMastold.getIoType() - 100); // 鍏ュ嚭搴撶姸鎬侊細 1.搴撴牸绉昏浇
wrkMast.setIoPri(12D);
+ wrkMast.setStaNo(1032);
+ wrkMast.setSourceStaNo(1031);
wrkMast.setCrnNo(7);
wrkMast.setLocNo(dto.getLocNo()); // 鐩爣搴撲綅
wrkMast.setFullPlt("Y"); // 婊℃澘
@@ -1894,16 +1904,18 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
// 宸ヤ綔妗ｆ槑缁嗕繚瀛�
- for (WrkDetl wrk : wrkDetls) {
- WrkDetl wrkDetl = new WrkDetl();
- Synchro.Copy(wrk, wrkDetl);
- wrkDetl.setWrkNo(workNo);
- wrkDetl.setIoTime(new Date());
- wrkDetl.setAnfme(wrk.getAnfme());
- wrkDetl.setAppeTime(new Date());
- wrkDetl.setModiTime(new Date());
- if (!wrkDetlService.insert(wrkDetl)) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
+ if (wrkDetls != null) {
+ for (WrkDetl wrk : wrkDetls) {
+ WrkDetl wrkDetl = new WrkDetl();
+ Synchro.Copy(wrk, wrkDetl);
+ wrkDetl.setWrkNo(workNo);
+ wrkDetl.setIoTime(new Date());
+ wrkDetl.setAnfme(wrk.getAnfme());
+ wrkDetl.setAppeTime(new Date());
+ wrkDetl.setModiTime(new Date());
+ if (!wrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
+ }
}
}
// 淇敼鐩爣搴撲綅鐘舵��
@@ -1923,7 +1935,7 @@
public void toCrn(WrkMast wrkMastold, List<WrkDetl> wrkDetls, Short locType) {
LocTypeDto locTypeDto = new LocTypeDto();
locTypeDto.setLocType1(locType);
- StartupDto dto = commonService.getLocNo(1, 1035, null, null, null, locTypeDto, false);
+ StartupDto dto = commonService.getLocNo(1, 1135, null, null, null, locTypeDto, false);
if (Cools.isEmpty(dto)) {
throw new CoolException("鍘诲爢鍨涙満鏈壘鍒板簱浣�");
}
@@ -1935,14 +1947,16 @@
wrkMast.setWrkNo(workNo);
wrkMast.setIoTime(new Date());
wrkMast.setWrkSts(1L); // 宸ヤ綔鐘舵�侊細1.鐢熸垚鍏ュ簱ID
- wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細 1.鍏ュ簱
+ wrkMast.setIoType(wrkMastold.getIoType() - 100); // 鍏ュ嚭搴撶姸鎬侊細 1.鍏ュ簱
wrkMast.setIoPri(12D);
- wrkMast.setCrnNo(7);
+ wrkMast.setCrnNo(1);
+ wrkMast.setStaNo(1131);
+ wrkMast.setSourceStaNo(1135);
wrkMast.setLocNo(dto.getLocNo()); // 鐩爣搴撲綅
- wrkMast.setFullPlt("Y"); // 婊℃澘
+ wrkMast.setFullPlt(wrkDetls == null ? "N" : "Y"); // 婊℃澘
wrkMast.setPicking("N"); // 鎷ｆ枡
wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setEmptyMk("Y"); // 绌烘澘
+ wrkMast.setEmptyMk(wrkDetls != null ? "N" : "Y"); // 绌烘澘
wrkMast.setBarcode(wrkMastold.getBarcode()); // 鎵樼洏鐮�
wrkMast.setLinkMis("N");
wrkMast.setAppeTime(new Date());
@@ -1952,16 +1966,18 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
// 宸ヤ綔妗ｆ槑缁嗕繚瀛�
- for (WrkDetl wrk : wrkDetls) {
- WrkDetl wrkDetl = new WrkDetl();
- Synchro.Copy(wrk, wrkDetl);
- wrkDetl.setWrkNo(workNo);
- wrkDetl.setIoTime(new Date());
- wrkDetl.setAnfme(wrk.getAnfme());
- wrkDetl.setAppeTime(new Date());
- wrkDetl.setModiTime(new Date());
- if (!wrkDetlService.insert(wrkDetl)) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
+ if (wrkDetls != null) {
+ for (WrkDetl wrk : wrkDetls) {
+ WrkDetl wrkDetl = new WrkDetl();
+ Synchro.Copy(wrk, wrkDetl);
+ wrkDetl.setWrkNo(workNo);
+ wrkDetl.setIoTime(new Date());
+ wrkDetl.setAnfme(wrk.getAnfme());
+ wrkDetl.setAppeTime(new Date());
+ wrkDetl.setModiTime(new Date());
+ if (!wrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
+ }
}
}
// 淇敼鐩爣搴撲綅鐘舵��
@@ -1976,4 +1992,5 @@
}
}
+
}
--
Gitblit v1.9.1