From 64b5946fd1a0cba0fbae54f7334167cb7adfdc97 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期五, 11 十月 2024 19:20:59 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 4 +++-
src/main/java/com/zy/common/entity/OutLocBoxExcel.java | 2 ++
src/main/java/com/zy/asrs/entity/param/StockOutParam.java | 3 +++
src/main/java/com/zy/asrs/entity/result/OutLocBoxVo.java | 10 ++++++++++
src/main/java/com/zy/common/model/LocDto.java | 2 ++
src/main/java/com/zy/asrs/controller/OutController.java | 1 +
src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java | 21 +++++++++++++++++++--
7 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 53435bd..057837a 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -156,6 +156,7 @@
locDetl.setModel(locDto.getModel());
locDetl.setSpecs(locDto.getSpecs());
locDetl.setZpallet(locDto.getZpallet());
+ locDetl.setMemo(locDto.getMemo());
param.setOrderNo(locDto.getOrderNo());
diff --git a/src/main/java/com/zy/asrs/entity/param/StockOutParam.java b/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
index ca4874b..a160fbd 100644
--- a/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
@@ -13,6 +13,7 @@
// 鍑虹珯鍙�
private Integer outSite;
private String orderNo;
+ private String cstmrName;
// 鐗╂枡缂栧彿闆嗗悎
private List<LocDetl> locDetls;
@@ -29,6 +30,8 @@
//鏈ㄧ缂栫爜
private String batch;
+ private String memo;
+
//鎵规
private String model;
diff --git a/src/main/java/com/zy/asrs/entity/result/OutLocBoxVo.java b/src/main/java/com/zy/asrs/entity/result/OutLocBoxVo.java
index 1f6b3cf..6696990 100644
--- a/src/main/java/com/zy/asrs/entity/result/OutLocBoxVo.java
+++ b/src/main/java/com/zy/asrs/entity/result/OutLocBoxVo.java
@@ -15,6 +15,10 @@
private String batch;
@ExcelProperty(value = "璁㈠崟鍙�")
private String orderNo;
+ @ExcelProperty(value = "瀹㈡埛")
+ private String cstmrName;
+ @ExcelProperty(value = "澶囨敞")
+ private String memo="";
public OutLocBoxVo() {
}
@@ -27,5 +31,11 @@
this.batch = batch;
this.orderNo = orderNo;
}
+ public OutLocBoxVo(String batch,String orderNo,String cstmrName,String memo) {
+ this.batch = batch;
+ this.orderNo = orderNo;
+ this.cstmrName = cstmrName;
+ this.memo = memo;
+ }
}
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 09fbb2d..b9b47ca 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -167,6 +167,7 @@
for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())) {
LocDetl one = locDetlService.selectItem(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getBatch());
+ one.setMemo(paramLocDetl.getMemo());
if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount(), param.getOrderNo()));
}
}
@@ -206,7 +207,7 @@
null, // 鍒濆绁ㄦ嵁鍙�
null, // 绁ㄦ嵁鍙�
null, // 瀹㈡埛缂栧彿
- null, // 瀹㈡埛
+ param.getCstmrName(), // 瀹㈡埛
null, // 鑱旂郴鏂瑰紡
null, // 鎿嶄綔浜哄憳
null, // 鍚堣閲戦
@@ -267,6 +268,7 @@
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
+ orderDetl.setMemo(locDetl.getMemo());
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
diff --git a/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java b/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
index 19c0db8..e8440e4 100644
--- a/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
@@ -30,6 +30,7 @@
private int total = 0;
private String orderOneNo = null;
+ private String cstmrName = null;
private Long userId;
List<String[]> OutLocBoxCs = new ArrayList<>();
@@ -61,6 +62,8 @@
public void invoke(OutLocBoxExcel excel, AnalysisContext ctx) {
String batch = excel.getBatch();
String orderNo = excel.getOrderNo();
+// String cstmrName = excel.getCstmrName();
+ String memo = excel.getMemo();
if (Cools.isEmpty(orderOneNo)){
if (!Cools.isEmpty(excel.getOrderNo())){
orderOneNo = excel.getOrderNo();
@@ -68,9 +71,18 @@
throw new CoolException("璁㈠崟鍙峰弬鏁颁负绌�");
}
}
- String[] s=new String[2];
+ if (Cools.isEmpty(cstmrName)){
+ if (!Cools.isEmpty(excel.getCstmrName())){
+ cstmrName = excel.getCstmrName();
+ } else {
+ throw new CoolException("瀹㈡埛鍚嶇О鍙傛暟涓虹┖");
+ }
+ }
+ String[] s=new String[4];
s[0] = batch;
s[1] = orderOneNo;
+ s[2] = cstmrName;
+ s[3] = memo;
OutLocBoxCs.add(s);
total++;
}
@@ -106,9 +118,11 @@
.eq("loc_no", locDetlSou.getLocNo()).eq("origin", locDetlSou.getOrigin()));
for (LocDetl locDetl:locDetls){
total++;
- String[] locDetlNow=new String[2];
+ String[] locDetlNow=new String[4];
locDetlNow[0] = locDetl.getBatch();
locDetlNow[1] = outLocBoxC[1];
+ locDetlNow[2] = outLocBoxC[2];
+ locDetlNow[3] = outLocBoxC[3];
outLocBoxCList.add(locDetlNow);
outLocBoxCNew.add(outLocBoxC[0]);
}
@@ -124,6 +138,7 @@
// locDetl.getBatch(),locDetl.getBrand(),locDetl.getBarcode(), outLocBoxC[1],locDetl.getAnfme());
// locDto.setOrigin(locDetl.getOrigin());
// locDto.setWeight(locDetl.getWeight());
+ locDetl.setMemo(outLocBoxC[3]);
LocDto locDto = new LocDto(locDetl);
locDtos.add(locDto);
}
@@ -150,11 +165,13 @@
locDetl.setZpallet(locDto.getZpallet());
locDetl.setOrigin(locDto.getOrigin());
locDetl.setWeight(locDto.getWeight());
+ locDetl.setMemo(locDto.getMemo());
locDetls.add(locDetl);
}
param.setLocDetls(locDetls);
param.setOrderNo(orderOneNo);
+ param.setCstmrName(cstmrName);
if (total>0){
workService.startupFullTakeStoreOrder(param,9999L);
diff --git a/src/main/java/com/zy/common/entity/OutLocBoxExcel.java b/src/main/java/com/zy/common/entity/OutLocBoxExcel.java
index da20ef7..9c2bfc0 100644
--- a/src/main/java/com/zy/common/entity/OutLocBoxExcel.java
+++ b/src/main/java/com/zy/common/entity/OutLocBoxExcel.java
@@ -19,5 +19,7 @@
private String batch;
private String orderNo;
+ private String cstmrName;//瀹㈡埛
+ private String memo;
}
diff --git a/src/main/java/com/zy/common/model/LocDto.java b/src/main/java/com/zy/common/model/LocDto.java
index de1a694..33323bb 100644
--- a/src/main/java/com/zy/common/model/LocDto.java
+++ b/src/main/java/com/zy/common/model/LocDto.java
@@ -31,6 +31,7 @@
private String zpallet;
private String orderNo;
+ private String memo;
private String origin;
@@ -109,6 +110,7 @@
this.volume = locDetl.getVolume();
this.price = locDetl.getPrice();
this.origin = locDetl.getOrigin();
+ this.memo = locDetl.getMemo();
}
public String getTitle() {
--
Gitblit v1.9.1