From b1902c110cfb177b63ec2290d43505e58bbc60b3 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期五, 07 五月 2021 14:43:15 +0800
Subject: [PATCH] 1.入库作业允许前端增加生产单号和通知单号
---
src/main/java/com/zy/asrs/entity/param/FullStoreParam.java | 22 ++++++++++++++++++++++
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 2 +-
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 8 ++++++++
src/main/java/com/zy/asrs/entity/MatCodeCountDto.java | 24 +++++++++++++++++++++++-
4 files changed, 54 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/MatCodeCountDto.java b/src/main/java/com/zy/asrs/entity/MatCodeCountDto.java
index 642c06f..53faff7 100644
--- a/src/main/java/com/zy/asrs/entity/MatCodeCountDto.java
+++ b/src/main/java/com/zy/asrs/entity/MatCodeCountDto.java
@@ -11,13 +11,19 @@
private String matStatus;
+ private String str5;
+
+ private String str6;
+
public MatCodeCountDto() {
}
- public MatCodeCountDto(String matNo, Double count, String matStatus) {
+ public MatCodeCountDto(String matNo, Double count, String matStatus, String str5, String str6) {
this.matNo = matNo;
this.count = count;
this.matStatus = matStatus;
+ this.str5 = str5;
+ this.str6 = str6;
}
public String getMatNo() {
@@ -43,4 +49,20 @@
public void setMatStatus(String matStatus) {
this.matStatus = matStatus;
}
+
+ public String getStr5() {
+ return str5;
+ }
+
+ public void setStr5(String str5) {
+ this.str5 = str5;
+ }
+
+ public String getStr6() {
+ return str6;
+ }
+
+ public void setStr6(String str6) {
+ this.str6 = str6;
+ }
}
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 fb7b9ac..5380dc7 100644
--- a/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
@@ -28,6 +28,12 @@
private String matStatus;
+ // 鐢熶骇鍗曞彿
+ private String str5;
+
+ // 閫氱煡鍗曞彿
+ private String str6;
+
public String getMatNo() {
return matNo;
}
@@ -51,6 +57,22 @@
public void setMatStatus(String matStatus) {
this.matStatus = matStatus;
}
+
+ public String getStr5() {
+ return str5;
+ }
+
+ public void setStr5(String str5) {
+ this.str5 = str5;
+ }
+
+ public String getStr6() {
+ return str6;
+ }
+
+ public void setStr6(String str6) {
+ this.str6 = str6;
+ }
}
public String getBarcode() {
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 80c6c09..7c42b94 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -111,7 +111,7 @@
List<MatCodeCountDto> matDtos = new ArrayList<>();
if (Cools.isEmpty(param.getProductCode())) {
param.getList().forEach(elem -> {
- matDtos.add(new MatCodeCountDto(elem.getMatNo(), elem.getCount(), elem.getMatStatus()));
+ matDtos.add(new MatCodeCountDto(elem.getMatNo(), elem.getCount(), elem.getMatStatus(), elem.getStr5(), elem.getStr6()));
});
wrkDetlService.createWorkDetail(workNo, matDtos, 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 1aafa90..b98cf27 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -40,6 +40,14 @@
wrkDetl.setIoTime(new Date());
wrkDetl.setAnfme(dto.getCount()); // 鏁伴噺
VersionUtils.setWrkDetl(wrkDetl, matCode); // 鐗堟湰鎺у埗
+ // 濡傛灉鐢熸垚鍗曞彿涓虹┖杩涜琛ュ厖
+ if (Cools.isEmpty(wrkDetl.getMnemonic())) {
+ wrkDetl.setMnemonic(dto.getStr5());
+ }
+ // 濡傛灉閫氱煡鍗曞彿涓虹┖杩涜琛ュ厖
+ if (Cools.isEmpty(wrkDetl.getSupplier())) {
+ wrkDetl.setSupplier(dto.getStr6());
+ }
wrkDetl.setZpallet(barcode); // 鎵樼洏鏉＄爜
wrkDetl.setAppeUser(userId);
wrkDetl.setAppeTime(new Date());
--
Gitblit v1.9.1