From 4901728f970314cddd9fa167cf3d3fb9476208e5 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期五, 18 二月 2022 08:12:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sxjzasrs' into sxjzasrs
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 3 +++
1 files changed, 3 insertions(+), 0 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 98cf0ee..fbc865f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -106,6 +106,7 @@
pltBarcode.setVendor(combMat.getVendor());
pltBarcode.setSource(combMat.getSource());
pltBarcode.setQtyBox(matCode.getStr6());
+ pltBarcode.setMemo(combMat.getMemo());
if (!pltBarcodeService.insert(pltBarcode)) {
throw new CoolException("淇濆瓨鏁版嵁澶辫触");
}
@@ -166,6 +167,8 @@
pltBarcode.setAllWeight(matCode.getWeight()*pltBarcode.getQty()+30);
pltBarcode.setVendor(combMat.getVendor());
pltBarcode.setSource(combMat.getSource());
+ pltBarcode.setQtyBox(matCode.getStr6());
+ pltBarcode.setMemo(combMat.getMemo());
if (!pltBarcodeService.insert(pltBarcode)) {
throw new CoolException("淇濆瓨鏁版嵁澶辫触");
}
--
Gitblit v1.9.1