From 57b71a11fbe827dd822d0697b3eeaf2ddb08e948 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期一, 16 六月 2025 10:08:19 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/model/MatDto.java | 43 ++++++++++-----------
src/main/resources/mapper/WrkDetlMapper.xml | 1
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 13 ++++++
src/main/java/com/zy/asrs/entity/WrkDetl.java | 7 +++
4 files changed, 40 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index a520d03..20c692e 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -269,6 +269,13 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 搴撳瓨
+ */
+ @ApiModelProperty(value = "搴撳瓨")
+ @TableField("stock_num")
+ private Double stockNum;
+
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 08ac542..497f6c2 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1668,7 +1668,18 @@
// }catch (Exception e){
// log.error("宸ヤ綔妗ｆ鏄庣粏杈撳叆鐢佃鏈哄け璐�1锛氬紓甯镐俊鎭�==銆�"+e);
// }
- wrkDetls.forEach(wrkDetl -> ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(),wrkDetl.getWeight(),wrkDetl.getSpecs(),wrkDetl.getSku())));
+ wrkDetls.forEach(wrkDetl -> ledCommand.getMatDtos().add(new MatDto(
+ wrkDetl.getMatnr()
+ , wrkDetl.getMaktx()
+ , wrkDetl.getAnfme()
+ , wrkDetl.getWeight()
+ , wrkDetl.getStockNum()
+ , wrkDetl.getSpecs()
+ , wrkDetl.getSku()
+ , wrkDetl.getBarcode()
+ , wrkDetl.getModel()
+ , wrkDetl.getSupp()
+ )));
}
commands.add(ledCommand);
}
diff --git a/src/main/java/com/zy/common/model/MatDto.java b/src/main/java/com/zy/common/model/MatDto.java
index e45246a..316a804 100644
--- a/src/main/java/com/zy/common/model/MatDto.java
+++ b/src/main/java/com/zy/common/model/MatDto.java
@@ -13,6 +13,7 @@
// 鐗╂枡鍚嶇О
private String maktx;
+
private String maknx;
// 搴撲綅瑙勬牸
@@ -23,40 +24,36 @@
// 搴撲綅鏁伴噺
private Double total;
- //宸ュ簭
+
+ //杈呮暟閲�
+ private Double weight;
+
+ //鎵樼洏鐮�
+ private String barcode;
+
+ //u8鏃у搧鍚�
private String sku;
+
+ //鍨嬪彿
+ private String model;
+
+ //瀹㈡埛鍚嶇О
+ private String supp;
public MatDto() {
}
- public MatDto(String matNo, String maktx, Double count) {
+ public MatDto(String matNo, String maktx, Double count, Double weight, Double total, String specs, String sku, String barcode, String model, String supp) {
this.matnr = matNo;
this.maktx = maktx;
this.maknx = maktx;
- this.count = count;
- }
- public MatDto(String matNo, String maktx, Double count,String specs) {
this.specs = specs;
- this.matnr = matNo;
- this.maktx = maktx;
- this.maknx = maktx;
- this.count = count;
- }
- public MatDto(String matNo, String maktx, Double count,Double total,String specs) {
- this.specs = specs;
- this.matnr = matNo;
- this.maktx = maktx;
- this.maknx = maktx;
this.count = count;
this.total = total;
- }
- public MatDto(String matNo, String maktx, Double count,Double total,String specs,String sku) {
- this.specs = specs;
- this.matnr = matNo;
- this.maktx = maktx;
- this.maknx = maktx;
- this.count = count;
- this.total = total;
+ this.weight = weight;
this.sku = sku;
+ this.barcode = barcode;
+ this.model = model;
+ this.supp = supp;
}
}
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index 946ccfb..06f6295 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -24,6 +24,7 @@
<result column="modi_time" property="modiTime" />
<result column="appe_user" property="appeUser" />
<result column="appe_time" property="appeTime" />
+ <result column="stock_num" property="stockNum" />
</resultMap>
<select id="findByWorkNo" resultMap="BaseResultMap">
--
Gitblit v1.9.1