From da494a63baf1ad3f2318fb2cf56f08408161df3c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 02 八月 2025 14:20:09 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 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 02676c6..e2a8afe 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -49,13 +49,30 @@
}else {
wrkDetl.setSupplier(dto.getSupplier());
}
-
wrkDetl.setZpallet(barcode); // 鎵樼洏鏉＄爜
wrkDetl.setAppeUser(userId);
wrkDetl.setAppeTime(new Date());
wrkDetl.setMemo(dto.getMemo());
wrkDetl.setModiUser(userId);
wrkDetl.setModiTime(new Date());
+ //鏂板鍔犲瓧娈�
+ if(matCode.getWeight()==null){
+ matCode.setWeight(0.0);
+ }
+ if(matCode.getStr6()==null){
+ matCode.setStr6(0.0);
+ wrkDetl.setAllQty(dto.getCount());
+ }else {
+ wrkDetl.setAllQty(matCode.getStr6()*dto.getCount());
+ }
+ wrkDetl.setAllWeight(matCode.getWeight()*dto.getCount()+30);
+ wrkDetl.setSource(dto.getSource());
+ wrkDetl.setVendor(dto.getVendor());
+ wrkDetl.setWeight(matCode.getWeight());
+ wrkDetl.setQtyBox(matCode.getStr6());
+ wrkDetl.setStr3(matCode.getStr3());
+ wrkDetl.setStr4(matCode.getStr4());
+ wrkDetl.setStr5(matCode.getStr5());
if (!this.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
}
@@ -75,4 +92,19 @@
public List<WrkDetl> queryMatFromDevNo(Integer devNo) {
return baseMapper.queryMatFromDevNo(devNo);
}
+
+ @Override
+ public List<WrkDetl> selectByWrkNo(Integer wrkNo) {
+ return this.baseMapper.selectByWrkNo(wrkNo);
+ }
+
+ @Override
+ public WrkDetl selectByZpallet0(String zpallet) {
+ return this.baseMapper.selectByZpallet0(zpallet);
+ }
+
+ @Override
+ public boolean updateBarcode(String sBarcode,String tBarcode,String batch) {
+ return baseMapper.updateBarcode(sBarcode,tBarcode,batch) > 0;
+ }
}
--
Gitblit v1.9.1