From 358d17658629931964ad421be77c94240310ed63 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 26 六月 2024 13:27:36 +0800
Subject: [PATCH] Merge branch 'phpsasrs' of http://47.97.1.152:5880/r/zy-asrs into phpsasrs
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 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 d472c07..87e7d6e 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -763,6 +763,13 @@
Date now = new Date();
List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", param.getLocNo()));
+ String zpallet = "";
+ for (LocDetl locDetl : locDetls) {
+ if (!Cools.isEmpty(locDetl.getZpallet())) {
+ zpallet = locDetl.getZpallet();
+ }
+ }
+
List<LocDetlAdjustParam.LocDetlAdjust> list = param.getList();
// 淇敼鏁伴噺
@@ -826,6 +833,7 @@
Mat mat = matService.selectByMatnr(adjust.getMatnr());
LocDetl locDetl = new LocDetl();
locDetl.sync(mat);
+ locDetl.setZpallet(zpallet);
locDetl.setBatch(adjust.getBatch());
locDetl.setBarcode(locDetls.get(0).getBarcode());
locDetl.setLocNo(locMast.getLocNo());
--
Gitblit v1.9.1