From 50acd5996ba9f88bbfd4341855c38b625598a190 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期四, 24 十月 2024 20:29:35 +0800
Subject: [PATCH] 打印添加制令,晚上订单上报
---
zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/task/ReportApiScheduler.java | 2 +-
zy-asrs-common/src/main/java/com/zy/asrs/common/utils/LocInPrintMatExcelListener.java | 11 ++++++++++-
zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/LocInPrintMatExcel.java | 2 ++
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocInPrintMat.java | 3 +++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TagController.java | 2 +-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/PostMesDataUtils.java | 2 +-
6 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/LocInPrintMatExcel.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/LocInPrintMatExcel.java
index 4c99ed4..8dd18bf 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/LocInPrintMatExcel.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/LocInPrintMatExcel.java
@@ -20,4 +20,6 @@
@ExcelProperty(index = 1, value = "鎵撳嵃鏁伴噺")
private String anfme;
+ @ExcelProperty(index = 2, value = "鍒朵护")
+ private String decrees;
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/LocInPrintMatExcelListener.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/LocInPrintMatExcelListener.java
index 4241eb3..11b637e 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/LocInPrintMatExcelListener.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/LocInPrintMatExcelListener.java
@@ -81,6 +81,12 @@
} catch (Exception e){
matax = "";
}
+ String decrees = "";
+ try{
+ decrees = excel.getDecrees();
+ } catch (Exception e){
+ decrees = "";
+ }
String anfme = "1";
try{
String anfme1 = excel.getAnfme();
@@ -97,10 +103,11 @@
} catch (Exception e){
anfme = "1";
}
- String[] s=new String[3];
+ String[] s=new String[4];
s[0] = matnr;
s[1] = matax;
s[2] = anfme;
+ s[3] = decrees;
printMatList.add(s);
total++;
totalAnfme = totalAnfme+Integer.parseInt(anfme);
@@ -119,6 +126,7 @@
String matnr = printMat[0];
String matax = printMat[1];
String anfme = printMat[2];
+ String decrees = printMat[3];
Integer intAnfme = 1;
try{
Integer intAnfme1 = Integer.parseInt(anfme);
@@ -135,6 +143,7 @@
locInPrintMat.setUpdateBy(userId);
locInPrintMat.setCreateTime(now);
locInPrintMat.setUpdateTime(now);
+ locInPrintMat.setDecrees(decrees);
locInPrintMatService.save(locInPrintMat);
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocInPrintMat.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocInPrintMat.java
index 99d948b..79d9b86 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocInPrintMat.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocInPrintMat.java
@@ -116,6 +116,9 @@
@ApiModelProperty(value= "鍟嗗搧鍚嶇О")
private Long ownerId;
+ @ApiModelProperty(value="鍒朵护")
+ private String decrees;
+
public LocInPrintMat() {}
public LocInPrintMat(String uuid,Integer status,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo,String matnr,String batch,Double anfme,String locNo,String maktx) {
diff --git a/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/task/ReportApiScheduler.java b/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/task/ReportApiScheduler.java
index 7df4a01..3da6a6a 100644
--- a/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/task/ReportApiScheduler.java
+++ b/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/task/ReportApiScheduler.java
@@ -42,7 +42,7 @@
@Autowired
private LocDetlService locDetlService;
- @Scheduled(cron = "0/3 * * * * ? ")
+// @Scheduled(cron = "0/3 * * * * ? ")
public void orderComplete() {
//璁㈠崟瀹屾垚涓婃姤
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TagController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TagController.java
index 00adcbe..6d57317 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TagController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TagController.java
@@ -233,7 +233,7 @@
print.setMemo(mat.getMemo());
print.setMaterial(mat.getMaterial());
- print.setDecrees(mat.getDecrees());
+ print.setDecrees(locInPrintMat.getDecrees());
print.setImgNum(mat.getImgNum());
print.setWeight(String.valueOf(mat.getWeight()));
print.setModel(mat.getModel());
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/PostMesDataUtils.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/PostMesDataUtils.java
index c4a09df..16bbf4c 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/PostMesDataUtils.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/PostMesDataUtils.java
@@ -79,7 +79,7 @@
log.error("", e); }
}
}
- if (success){
+ if (!success){
return FAIL.setMsg("涓婂牨澶辨晽");
}
return SUCCESS;
--
Gitblit v1.9.1