From faecccbe46a1f85b5d9b18fce12e02764faba78e Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期三, 09 六月 2021 12:58:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
index 1aafa90..b98cf27 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -40,6 +40,14 @@
wrkDetl.setIoTime(new Date());
wrkDetl.setAnfme(dto.getCount()); // 鏁伴噺
VersionUtils.setWrkDetl(wrkDetl, matCode); // 鐗堟湰鎺у埗
+ // 濡傛灉鐢熸垚鍗曞彿涓虹┖杩涜琛ュ厖
+ if (Cools.isEmpty(wrkDetl.getMnemonic())) {
+ wrkDetl.setMnemonic(dto.getStr5());
+ }
+ // 濡傛灉閫氱煡鍗曞彿涓虹┖杩涜琛ュ厖
+ if (Cools.isEmpty(wrkDetl.getSupplier())) {
+ wrkDetl.setSupplier(dto.getStr6());
+ }
wrkDetl.setZpallet(barcode); // 鎵樼洏鏉＄爜
wrkDetl.setAppeUser(userId);
wrkDetl.setAppeTime(new Date());
--
Gitblit v1.9.1