From 2d9665253e34da384fde299e2bc152a99f0c8ece Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 30 三月 2022 10:59:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/param/FullStoreParam.java | 47 ++++-------------------
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 2
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 8 ++-
src/main/webapp/static/js/pakStore/pakStore.js | 12 +++---
4 files changed, 20 insertions(+), 49 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java b/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
index 289ba63..3df87a9 100644
--- a/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
@@ -1,10 +1,13 @@
package com.zy.asrs.entity.param;
+import lombok.Data;
+
import java.util.List;
/**
* Created by vincent on 2020/6/11
*/
+@Data
public class FullStoreParam {
// 鎵樼洏鏉＄爜
@@ -16,52 +19,18 @@
// 鐗╂枡鍒楄〃鏁版嵁
private List<MatCodeStore> list;
+ @Data
public static class MatCodeStore {
// 鐗╂枡缂栧彿
private String matNo;
+ // 鎵瑰彿
+ private String batch;
+
// 鐗╂枡鏁伴噺
- private Double count;
+ private Double anfme;
- public String getMatNo() {
- return matNo;
- }
-
- public void setMatNo(String matNo) {
- this.matNo = matNo;
- }
-
- public Double getCount() {
- return count;
- }
-
- public void setCount(Double count) {
- this.count = count;
- }
}
- public String getBarcode() {
- return barcode;
- }
-
- public void setBarcode(String barcode) {
- this.barcode = barcode;
- }
-
- public Integer getDevpNo() {
- return devpNo;
- }
-
- public void setDevpNo(Integer devpNo) {
- this.devpNo = devpNo;
- }
-
- public List<MatCodeStore> getList() {
- return list;
- }
-
- public void setList(List<MatCodeStore> list) {
- this.list = list;
- }
}
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 e8ea487..d9b42a0 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -112,7 +112,7 @@
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
List<DetlDto> detlDtos = new ArrayList<>();
param.getList().forEach(elem -> {
- detlDtos.add(new DetlDto(elem.getMatNo(), elem.getCount()));
+ detlDtos.add(new DetlDto(elem.getMatNo(), elem.getBatch(), elem.getAnfme()));
});
wrkDetlService.createWorkDetail(workNo, detlDtos, param.getBarcode(), userId);
// 鏇存柊婧愮珯鐐逛俊鎭�
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 80546b5..46a0c58 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -29,6 +29,7 @@
if (detlDtos.isEmpty()){
return;
}
+ Date now = new Date();
for (DetlDto dto : detlDtos) {
MatCode matCode = matCodeService.selectById(dto.getMatnr());
if (Cools.isEmpty(matCode)){
@@ -37,14 +38,15 @@
// 淇濇寔宸ヤ綔妗ｆ槑缁�
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.setWrkNo(workNo);
- wrkDetl.setIoTime(new Date());
+ wrkDetl.setIoTime(now);
+ wrkDetl.setBatch(dto.getBatch());
wrkDetl.setAnfme(dto.getAnfme()); // 鏁伴噺
VersionUtils.setWrkDetl(wrkDetl, matCode); // 鐗堟湰鎺у埗
wrkDetl.setZpallet(barcode); // 鎵樼洏鏉＄爜
wrkDetl.setAppeUser(userId);
- wrkDetl.setAppeTime(new Date());
+ wrkDetl.setAppeTime(now);
wrkDetl.setModiUser(userId);
- wrkDetl.setModiTime(new Date());
+ wrkDetl.setModiTime(now);
if (!this.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
}
diff --git a/src/main/webapp/static/js/pakStore/pakStore.js b/src/main/webapp/static/js/pakStore/pakStore.js
index c803685..9d61001 100644
--- a/src/main/webapp/static/js/pakStore/pakStore.js
+++ b/src/main/webapp/static/js/pakStore/pakStore.js
@@ -65,17 +65,17 @@
case 'comb':
// 鍒ゆ柇鏄惁瀛樺湪鐗╂枡
if (matCodeData.length === 0) {
- layer.msg("璇峰厛娣诲姞鐗╂枡");
+ layer.msg("璇峰厛鎻愬彇鍟嗗搧", {icon: 2});
return;
}
// 鍒ゆ柇鐗╂枡鏁伴噺鏄惁瀛樺湪寮傚父
for (var i=0;i<matCodeData.length;i++){
if (isNaN(matCodeData[i].anfme)) {
- layer.msg("璇疯緭鍏ユ暟瀛�");
+ layer.msg("璇疯緭鍏ユ暟瀛�", {icon: 2});
return;
}
- if (matCodeData[i].anfme === 0){
- layer.msg("鏁伴噺涓嶈兘涓洪浂");
+ if (matCodeData[i].anfme <= 0){
+ layer.msg("鏁伴噺蹇呴』澶т簬闆�", {icon: 2});
return;
}
}
@@ -91,7 +91,7 @@
async: false,
success: function (res) {
if (res.code === 200){
- layer.msg("鍏ュ簱鍚姩鎴愬姛锛岀洰鏍囧簱浣嶏細" + res.data);
+ layer.msg("鍏ュ簱鍚姩鎴愬姛锛岀洰鏍囧簱浣嶏細" + res.data, {icon: 1});
matCodeData = [];
$('#focusMatByMat').val("");
tableIns.reload({data: matCodeData,done:function (res) { limit(); getInBound();}});
@@ -99,7 +99,7 @@
} else if (res.code === 403){
top.location.href = baseUrl+"/";
}else {
- layer.msg(res.msg)
+ layer.msg(res.msg, {icon: 2})
}
}
})
--
Gitblit v1.9.1