From f2ae2106f8b7906076a509692f298b19e6cf360b Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期一, 16 六月 2025 15:43:57 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/model/MatDto.java | 12 ++++++++++--
src/main/resources/mapper/WrkDetlMapper.xml | 2 ++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 ++
src/main/java/com/zy/asrs/entity/WrkDetl.java | 14 ++++++++++++++
4 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 5789dc1..cec86f4 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -315,6 +315,20 @@
@TableField("stock_num")
private Double stockNum;
+ /**
+ * 寮�绁ㄥ鎴峰悕绉�
+ */
+ @ApiModelProperty(value = "寮�绁ㄥ鎴峰悕绉�")
+ @TableField("kp_cstmr_name")
+ private String kpCstmrName;
+
+ /**
+ * 杈呭簱瀛�
+ */
+ @ApiModelProperty(value = "杈呭簱瀛�")
+ @TableField("stock_num2")
+ private Double stockNum2;
+
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 9ab8eb8..b156c97 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1675,11 +1675,13 @@
, wrkDetl.getAnfme()
, wrkDetl.getWeight()
, wrkDetl.getStockNum()
+ , wrkDetl.getStockNum2()
, wrkDetl.getSpecs()
, wrkDetl.getSku()
, wrkDetl.getZpallet()
, wrkDetl.getModel()
, wrkDetl.getSupp()
+ , wrkDetl.getKpCstmrName()
)));
}
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 316a804..da13eca 100644
--- a/src/main/java/com/zy/common/model/MatDto.java
+++ b/src/main/java/com/zy/common/model/MatDto.java
@@ -28,6 +28,9 @@
//杈呮暟閲�
private Double weight;
+ // 杈呭簱浣嶆暟閲�
+ private Double totalWeight;
+
//鎵樼洏鐮�
private String barcode;
@@ -40,20 +43,25 @@
//瀹㈡埛鍚嶇О
private String supp;
+ //寮�绁ㄥ鎴峰悕绉�
+ private String kpCstmrName;
+
public MatDto() {
}
- public MatDto(String matNo, String maktx, Double count, Double weight, Double total, String specs, String sku, String barcode, String model, String supp) {
+ public MatDto(String matNo, String maktx, Double count, Double weight, Double total, Double totalWeight, String specs, String sku, String barcode, String model, String supp, String kpCstmrName) {
this.matnr = matNo;
this.maktx = maktx;
this.maknx = maktx;
this.specs = specs;
this.count = count;
- this.total = total;
this.weight = weight;
+ this.total = total;
+ this.totalWeight = totalWeight;
this.sku = sku;
this.barcode = barcode;
this.model = model;
this.supp = supp;
+ this.kpCstmrName = kpCstmrName;
}
}
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index 2739993..5920ba9 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -52,6 +52,8 @@
<result column="box_type2" property="boxType2" />
<result column="box_type3" property="boxType3" />
<result column="stock_num" property="stockNum" />
+ <result column="kp_cstmr_name" property="kpCstmrName" />
+ <result column="stock_num2" property="stockNum2" />
</resultMap>
<select id="findByWorkNo" resultMap="BaseResultMap">
--
Gitblit v1.9.1