From f08a5ea16b9fd30d7832ac33d9c0ae3fae122102 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期日, 05 四月 2026 19:13:45 +0800
Subject: [PATCH] 重量1
---
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 5 +++++
src/main/java/com/zy/asrs/service/LocDetlService.java | 1 +
src/main/java/com/zy/asrs/entity/LocDetl.java | 3 ++-
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 8 ++++++++
src/main/java/com/zy/asrs/entity/WrkDetl.java | 3 ++-
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 1 +
src/main/java/com/zy/common/web/WcsController.java | 2 +-
src/main/java/com/zy/asrs/task/handler/WorkErpReportHandler.java | 22 +++++++++++-----------
8 files changed, 31 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 43a9228..060c30f 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -18,6 +18,7 @@
import lombok.Data;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -103,7 +104,7 @@
private Double safeQty;
@ApiModelProperty(value= "閲嶉噺")
- private Double weight;
+ private BigDecimal weight;
@ApiModelProperty(value= "闀垮害")
@TableField("man_length")
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 30abac5..f14dda1 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -11,6 +11,7 @@
import lombok.Data;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -162,7 +163,7 @@
* 閲嶉噺
*/
@ApiModelProperty(value= "閲嶉噺")
- private Double weight;
+ private BigDecimal weight;
/**
* 闀垮害
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index 2a70a61..72ed623 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -12,6 +12,7 @@
import org.apache.ibatis.annotations.Update;
import org.springframework.stereotype.Repository;
+import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -40,6 +41,10 @@
@Param("brand")String brand,@Param("standby1")String standby1,@Param("standby2")String standby2,
@Param("standby3")String standby3,@Param("boxType1")String boxType1,@Param("boxType2")String boxType2,@Param("boxType3")String boxType3 );
+ int updateWeight(@Param("weight") BigDecimal weight, @Param("locNo") String locNo, @Param("matnr") String matnr, @Param("batch") String batch,
+ @Param("brand") String brand, @Param("standby1") String standby1, @Param("standby2") String standby2,
+ @Param("standby3") String standby3, @Param("boxType1") String boxType1, @Param("boxType2") String boxType2, @Param("boxType3") String boxType3);
+
List<LocDetl> getStockOutPage(Map<String, Object> map);
Integer getStockOutPageCount(Map<String, Object> map);
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 9b9de10..9e88d51 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -9,6 +9,7 @@
import com.zy.asrs.entity.result.LocDetlDTO;
import com.zy.asrs.entity.result.StockVo;
+import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
import java.util.Set;
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index 08986ec..061aedb 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -13,6 +13,7 @@
import com.zy.asrs.service.LocDetlService;
import org.springframework.stereotype.Service;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkErpReportHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkErpReportHandler.java
index 3cf7306..61a6c66 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkErpReportHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkErpReportHandler.java
@@ -194,17 +194,17 @@
return total;
}
- private Double sumWeight(List<WrkDetl> wrkDetls) {
- double total = 0D;
- for (WrkDetl wrkDetl : wrkDetls) {
- if (Cools.isEmpty(wrkDetl.getWeight())) {
- continue;
- }
- double qty = Cools.isEmpty(wrkDetl.getAnfme()) ? 1D : wrkDetl.getAnfme();
- total += wrkDetl.getWeight() * qty;
- }
- return total;
- }
+// private Double sumWeight(List<WrkDetl> wrkDetls) {
+// double total = 0D;
+// for (WrkDetl wrkDetl : wrkDetls) {
+// if (Cools.isEmpty(wrkDetl.getWeight())) {
+// continue;
+// }
+// double qty = Cools.isEmpty(wrkDetl.getAnfme()) ? 1D : wrkDetl.getAnfme();
+// total += wrkDetl.getWeight() * qty;
+// }
+// return total;
+// }
private Date resolveCreateTime(WrkMast wrkMast) {
if (!Cools.isEmpty(wrkMast.getCrnEndTime())) {
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index a456d9b..2623345 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -139,6 +139,7 @@
locMast.setLocSts("D");
locMast.setIoTime(now);
locMast.setModiTime(now);
+ locMast.setScWeight(wrkMast.getScWeight());
if (!locMastService.updateById(locMast)) {
// exceptionHandle("绌烘澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐�;[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -179,6 +180,7 @@
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
locDetl.setModiTime(now);
locDetl.setAppeTime(now);
+ locDetl.setWeight(wrkDetl.getWeight());
if (!locDetlService.insert(locDetl)) {
// exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 娣诲姞搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -192,6 +194,7 @@
locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
locMast.setModiTime(now);
+ locMast.setScWeight(wrkMast.getScWeight());
if (!locMastService.updateById(locMast)) {
// exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -225,6 +228,7 @@
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
locDetl.setModiTime(now);
locDetl.setAppeTime(now);
+ locDetl.setWeight(wrkDetl.getWeight());
if (!locDetlService.insert(locDetl)) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("鎷ｆ枡閫斾腑骞舵澘 ===>> 娣诲姞搴撳瓨鏄庣粏澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
@@ -295,6 +299,7 @@
locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
locMast.setModiTime(now);
+ locMast.setScWeight(wrkMast.getScWeight());
if (!locMastService.updateById(locMast)) {
// exceptionHandle("鎷ｆ枡鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -331,6 +336,7 @@
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
locDetl.setModiTime(now);
locDetl.setAppeTime(now);
+ locDetl.setWeight(wrkDetl.getWeight());
if (!locDetlService.insert(locDetl)) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("骞舵澘鍏ュ簱 ===>> 鏂板搴撳瓨鏄庣粏澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
@@ -359,6 +365,7 @@
locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
locMast.setModiTime(now);
+ locMast.setScWeight(wrkMast.getScWeight());
if (!locMastService.updateById(locMast)) {
// exceptionHandle("骞舵澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -396,6 +403,7 @@
locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
locMast.setModiTime(now);
+ locMast.setScWeight(wrkMast.getScWeight());
if (!locMastService.updateById(locMast)) {
// exceptionHandle("鐩樼偣鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 1f202e0..53ebe96 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -498,7 +498,7 @@
wrkDetl.setIoTime(wrkMast.getIoTime());
wrkDetl.setAppeTime(now);
wrkDetl.setModiTime(now);
- wrkDetl.setWeight(waitPakin.getWeight());
+ wrkDetl.setWeight(wrkMast.getScWeight());
if (!wrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
}
--
Gitblit v1.9.1