From 0574251b05ea099b84d7ddd4bdc65a78ff03aea7 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期五, 18 二月 2022 08:11:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 4 ++--
src/main/webapp/views/wrkMast/wrkDetl.html | 2 +-
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 7 +++++++
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 10 +++++++++-
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 2 ++
src/main/webapp/views/pakStore/locDetlQuery.html | 6 ++++++
src/main/webapp/static/js/pakStore/stockOut.js | 10 ++++++++--
7 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index b5146b2..8031704 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -19,8 +19,8 @@
Integer getStockOutPageCount(Map<String, Object> map);
- @Update("update asr_loc_detl set qty=#{qty}, modi_time = getDate() where loc_no = #{locNo} and mat_no = #{matNo}")
- int updateAnfme(Double qty, String locNo, String matNo);
+ @Update("update asr_loc_detl set qty=#{qty}, modi_time = getDate(),all_weight=#{weight},all_qty=#{allQty} where loc_no = #{locNo} and mat_no = #{matNo}")
+ int updateAnfme(Double qty, String locNo, String matNo,Double weight,Double allQty);
@Update("update asr_loc_detl set loc_no = #{newLocNo}, modi_time=getDate() where loc_no = #{oldLocNo}")
int updateLocNo(String newLocNo, String oldLocNo);
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 8bc0d00..fb8b96b 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -4,8 +4,10 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.MatCode;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
+import com.zy.asrs.service.MatCodeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -16,6 +18,8 @@
@Autowired
private LocDetlMapper locDetlMapper;
+ @Autowired
+ private MatCodeService matCodeService;
@Override
@@ -30,7 +34,11 @@
if (qty <= 0) {
return delete(new EntityWrapper<LocDetl>().eq("loc_no", locNo).eq("mat_no", matNo).eq("supplier",supplier));
} else {
- int res = baseMapper.updateAnfme(qty, locNo, matNo);
+ MatCode matCode = matCodeService.selectById(matNo);
+ Double weight = qty*matCode.getWeight()+30;
+ Double allQty = qty*matCode.getStr6();
+
+ int res = baseMapper.updateAnfme(qty, locNo, matNo,weight,allQty);
return res > 0;
}
}
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 925a011..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("淇濆瓨鏁版嵁澶辫触");
}
@@ -167,6 +168,7 @@
pltBarcode.setVendor(combMat.getVendor());
pltBarcode.setSource(combMat.getSource());
pltBarcode.setQtyBox(matCode.getStr6());
+ pltBarcode.setMemo(combMat.getMemo());
if (!pltBarcodeService.insert(pltBarcode)) {
throw new CoolException("淇濆瓨鏁版嵁澶辫触");
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 0421911..2c60ab6 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -264,6 +264,7 @@
}
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
for (LocDetlDto detlDto : dto.getLocDetlDtos()) {
+ MatCode matCode = matCodeService.selectById(detlDto.getLocDetl().getMatNo());
// 鍑哄簱鏃讹紝鏁伴噺涓�0鐨勭洿鎺ュ拷鐣�
if (detlDto.getCount()==null || detlDto.getCount() <= 0.0D) {continue;}
WrkDetl wrkDetl = new WrkDetl();
@@ -277,6 +278,12 @@
wrkDetl.setModiTime(new Date());
wrkDetl.setModiUser(userId);
wrkDetl.setMemo(detlDto.getLocDetl().getMemo());
+ wrkDetl.setQtyBox(matCode.getStr6());
+ wrkDetl.setWeight(matCode.getWeight());
+ wrkDetl.setAllWeight(qty*matCode.getWeight()+30);
+ wrkDetl.setAllQty(qty*matCode.getStr6());
+ wrkDetl.setVendor(detlDto.getLocDetl().getVendor());
+ wrkDetl.setSource(detlDto.getLocDetl().getSource());
if (!wrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
diff --git a/src/main/webapp/static/js/pakStore/stockOut.js b/src/main/webapp/static/js/pakStore/stockOut.js
index 5919d4d..fdd9bd7 100644
--- a/src/main/webapp/static/js/pakStore/stockOut.js
+++ b/src/main/webapp/static/js/pakStore/stockOut.js
@@ -5,10 +5,16 @@
// {field: 'count', align: 'center',title: '鍑哄簱鏁伴噺', edit:'text', width: 130, style:'color: blue;font-weight: bold'}
{field: 'anfme', align: 'center',title: '鍑哄簱鏁伴噺',edit:'text',style:'color: blue;font-weight: bold'}
,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
- , {field: 'matNo', align: 'center',title: '浜у搧缂栫爜'}
+ ,{field: 'matNo', align: 'center',title: '浜у搧缂栫爜'}
,{field: 'matName', align: 'center',title: '浜у搧鍚嶇О'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'qty', align: 'center',title: '鏁伴噺'}
+ ,{field: 'qty', align: 'center',title: '搴撳瓨鏁伴噺'}
+ ,{field: 'source', title: '鏉ユ簮', align: 'center'}
+ ,{field: 'vendor', title: '渚涘簲鍟�', align: 'center'}
+ ,{field: 'qtyBox', align: 'center', title: '姣忕鏁伴噺(PCS)'}
+ ,{field: 'allQty', title: '鎬绘暟閲�(PCS)', align: 'center'}
+ ,{field: 'weight', align: 'center', title: '姣忕閲嶉噺(KG)'}
+ ,{field: 'allWeight', title: '鎬婚噸閲�(KG)', align: 'center'}
,{field: 'unit', align: 'center',title: '鍗曚綅', width:80, hide: true}
,{field: 'supplier', align: 'center',title: '鎵瑰彿'}
,{field: 'color', align: 'center',title: '棰滆壊'}
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index dcdcab7..e66e55a 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -101,6 +101,12 @@
,{field: 'matName', align: 'center',title: '浜у搧鍚嶇О'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
,{field: 'qty', align: 'center',title: '鏁伴噺'}
+ ,{field: 'source', title: '鏉ユ簮', align: 'center'}
+ ,{field: 'vendor', title: '渚涘簲鍟�', align: 'center'}
+ ,{field: 'qtyBox', align: 'center', title: '姣忕鏁伴噺(PCS)'}
+ ,{field: 'allQty', title: '鎬绘暟閲�(PCS)', align: 'center'}
+ ,{field: 'weight', align: 'center', title: '姣忕閲嶉噺(KG)'}
+ ,{field: 'allWeight', title: '鎬婚噸閲�(KG)', align: 'center'}
,{field: 'unit', align: 'center',title: '鍗曚綅', width:80, hide: true}
,{field: 'supplier', align: 'center',title: '鎵瑰彿'}
,{field: 'color', align: 'center',title: '棰滆壊'}
diff --git a/src/main/webapp/views/wrkMast/wrkDetl.html b/src/main/webapp/views/wrkMast/wrkDetl.html
index 1709786..48a4433 100644
--- a/src/main/webapp/views/wrkMast/wrkDetl.html
+++ b/src/main/webapp/views/wrkMast/wrkDetl.html
@@ -35,7 +35,7 @@
,{field: 'matNo', align: 'center',title: '浜у搧缂栫爜'}
,{field: 'matName', align: 'center',title: '浜у搧鍚嶇О'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'qty', align: 'center',title: '鍏ュ簱鏁伴噺'}
+ ,{field: 'qty', align: 'center',title: '鏁伴噺'}
,{field: 'qtyBox', align: 'center',title: '姣忕鏁伴噺(PCS)'}
,{field: 'allQty', align: 'center',title: '鎬绘暟閲�(PCS)'}
,{field: 'weight', align: 'center',title: '姣忕閲嶉噺(KG)'}
--
Gitblit v1.9.1