From a869e7291b6016b297bc00b30a2e83f8ed3983ea Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期一, 14 二月 2022 08:28:08 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 813c865..3977f57 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -18,6 +18,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.List;
import java.util.Random;
/**
@@ -77,7 +78,7 @@
pltBarcode.setUnit(matCode.getUnit());
pltBarcode.setSpecs(matCode.getSpecs());
pltBarcode.setSize(matCode.getSize());
- pltBarcode.setSupplier(combMat.getSupplier());
+// pltBarcode.setSupplier(combMat.getSupplier());
pltBarcode.setMemo(combMat.getMemo());
pltBarcode.setColor(matCode.getColor());
pltBarcode.setLinkErp(0);
@@ -85,7 +86,17 @@
pltBarcode.setModiTime(now);
pltBarcode.setAppeUser(userId);
pltBarcode.setAppeTime(now);
-
+ if(matCode.getWeight()==null){
+ matCode.setWeight(0.0);
+ }
+ if(matCode.getStr6()==null){
+ matCode.setStr6(0.0);
+ pltBarcode.setAllQty(pltBarcode.getQty());
+ }else {
+ pltBarcode.setAllQty(matCode.getStr6()*pltBarcode.getQty());
+ }
+ pltBarcode.setWeight(matCode.getWeight());
+ pltBarcode.setAllWeight(matCode.getWeight()*pltBarcode.getQty()+30);
if (!pltBarcodeService.insert(pltBarcode)) {
throw new CoolException("淇濆瓨鏁版嵁澶辫触");
}
@@ -94,6 +105,7 @@
// 鍏宠仈閫氱煡鍗曠粍鎵�
for (CombParam.CombMat combMat : param.getCombMats()) {
WaitMatin waitMatin = waitMatinService.selectOne(new EntityWrapper<WaitMatin>()
+
.eq("bill_no",param.getBillNo()).eq("seq_no",combMat.getSeqNo()));
if (waitMatin == null) {
--
Gitblit v1.9.1