From 09211d189468e0901180c4dde8340d5487657ccb Mon Sep 17 00:00:00 2001
From: Administrator <335182714>
Date: 星期四, 31 七月 2025 10:50:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghjtasrs' into ghjtasrs
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 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 4afc3a7..0bf1a91 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1564,6 +1564,16 @@
throw new CoolException("鏉＄爜涓嶈兘涓虹┖锛�" + param.getBarcode());
}
+ if (Cools.isEmpty(param.getAnfme())) {
+ throw new CoolException("璇疯緭鍏ユ暟閲�" + param.getAnfme());
+ }
+ if (Cools.isEmpty(param.getMemo())) {
+ throw new CoolException("璇疯緭鍏ュ娉�");
+ }
+ if (Cools.isEmpty(param.getOld())) {
+ throw new CoolException("璇疯緭鍏ユ柊鏃�" );
+ }
+
int zpalletCount = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
if (zpalletCount > 0) {
throw new CoolException("搴撳瓨鎵樼洏鐮佸凡瀛樺湪锛�" + param.getBarcode());
@@ -1611,6 +1621,7 @@
if (!Cools.isEmpty(param.getBatch())) {
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.setMatnr("绌虹");
+ wrkDetl.setSuppCode(param.getOld());
wrkDetl.setAnfme(param.getAnfme());
wrkDetl.setWrkNo(wrkMast.getWrkNo());
wrkDetl.setWrkNo(wrkMast.getWrkNo());
@@ -2207,7 +2218,7 @@
@Override
public List<Map<String, Object>> pdaGetMemo() {
- List<Integer> tagIds = Arrays.asList(7, 8);
+ List<Integer> tagIds = Arrays.asList(7, 8,9);
List<Map<String, Object>> raw = matMapper.getBoxMemoMap(tagIds);
// 鐢� Map<String, List<String>> 鍒嗙粍
--
Gitblit v1.9.1