From d1b031c864041c0c75e433bcd839aa9493f506bb Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期日, 20 十月 2024 11:11:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 58 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 32 insertions(+), 26 deletions(-)
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 8ac0a91..26be866 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -568,38 +568,44 @@
@Override
// @Transactional
public void leftoversOut(Map<String, Object> map,Long userId) {
-
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", map.get("barcode")).eq("io_type", 103));
+ String barcode = map.get("barcode").toString();
+ String barcode2 = map.get("barcode2").toString();
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", barcode).eq("io_type", 103));
if (Cools.isEmpty(wrkMast)) {
throw new CoolException("鏈煡璇㈠埌鎷ｆ枡浠诲姟");
}
- Date now = new Date();
int workNo = commonService.getWorkNo(1);
- WrkMast wrkMast1 = new WrkMast();
- wrkMast1.sync(wrkMast);
- wrkMast1.setWrkNo(workNo);
- wrkMast1.setWrkSts(2L);
- wrkMast1.setIoType(200);
- wrkMast1.setSourceStaNo(wrkMast.getStaNo() == 113 ? 111 : 117);
- wrkMast1.setStaNo(map.get("floor").hashCode() == 2 ? 204:304);
- wrkMast1.setIoTime(now);
- wrkMast1.setIoPri(13D); // 浼樺厛绾э細13
- wrkMast1.setCrnNo(wrkMast.getCrnNo());
- wrkMast1.setSourceLocNo(wrkMast.getLocNo()); // 婧愬簱浣�
- wrkMast1.setFullPlt("Y"); // 婊℃澘锛歒
- wrkMast1.setPicking("N"); // 鎷ｆ枡
- wrkMast1.setExitMk("N"); // 閫�鍑�
- wrkMast1.setEmptyMk("N"); // 绌烘澘
- wrkMast1.setLinkMis("N");
- wrkMast1.setAppeUser(userId); // 鎿嶄綔浜哄憳鏁版嵁
- wrkMast1.setAppeTime(now);
- wrkMast1.setModiUser(userId);
- wrkMast1.setModiTime(now);
- wrkMast1.setBarcode(wrkMast.getBarcode());
- if (!wrkMastService.insert(wrkMast1)) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ WrkMast wrkMast2 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", barcode2).eq("io_type", 200));
+ if (Cools.isEmpty(wrkMast2)) {
+ Date now = new Date();
+
+ WrkMast wrkMast1 = new WrkMast();
+ wrkMast1.sync(wrkMast);
+ wrkMast1.setWrkNo(workNo);
+ wrkMast1.setWrkSts(2L);
+ wrkMast1.setIoType(200);
+ wrkMast1.setSourceStaNo(wrkMast.getStaNo() == 113 ? 111 : 117);
+ wrkMast1.setStaNo(wrkMast.getStaNo() == 113 ? 204 : 304);
+ wrkMast1.setIoTime(now);
+ wrkMast1.setIoPri(13D); // 浼樺厛绾э細13
+ wrkMast1.setCrnNo(wrkMast.getCrnNo());
+ wrkMast1.setSourceLocNo(wrkMast.getLocNo()); // 婧愬簱浣�
+ wrkMast1.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMast1.setPicking("N"); // 鎷ｆ枡
+ wrkMast1.setExitMk("N"); // 閫�鍑�
+ wrkMast1.setEmptyMk("N"); // 绌烘澘
+ wrkMast1.setLinkMis("N");
+ wrkMast1.setAppeUser(userId); // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast1.setAppeTime(now);
+ wrkMast1.setModiUser(userId);
+ wrkMast1.setModiTime(now);
+ wrkMast1.setBarcode(barcode2);
+ if (!wrkMastService.insert(wrkMast1)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ }
}
+
List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("zpallet", map.get("barcode")));
if (Cools.isEmpty(wrkDetls)) {
throw new CoolException("鏈煡璇㈠埌鎷ｆ枡浠诲姟鏄庣粏");
--
Gitblit v1.9.1