From fc984634f050024ef1f0ff982af1f7f2b90ca750 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期一, 16 六月 2025 10:42:28 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/WrkDetlMapper.xml | 43 +++++++++++--
src/main/java/com/zy/asrs/entity/WrkDetl.java | 117 ++++++++++++++++++++++++++-------------
2 files changed, 113 insertions(+), 47 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 20c692e..5789dc1 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -22,254 +22,293 @@
/**
* 宸ヤ綔鍙�
*/
- @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @ApiModelProperty(value = "宸ヤ綔鍙�")
@TableField("wrk_no")
private Integer wrkNo;
/**
* 宸ヤ綔鏃堕棿
*/
- @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
+ @ApiModelProperty(value = "宸ヤ綔鏃堕棿")
@TableField("io_time")
private Date ioTime;
/**
* 鏁伴噺
*/
- @ApiModelProperty(value= "鏁伴噺")
+ @ApiModelProperty(value = "鏁伴噺")
private Double anfme;
/**
* 鎵樼洏鏉＄爜
*/
- @ApiModelProperty(value= "鎵樼洏鏉＄爜")
+ @ApiModelProperty(value = "鎵樼洏鏉＄爜")
private String zpallet;
/**
* 鐗╂枡
*/
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @ApiModelProperty(value = "鍟嗗搧缂栧彿")
private String matnr;
/**
* 鐗╂枡鎻忚堪
*/
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ @ApiModelProperty(value = "鍟嗗搧鍚嶇О")
private String maktx;
/**
* 鎵瑰彿
*/
- @ApiModelProperty(value= "鎵瑰彿")
+ @ApiModelProperty(value = "鎵瑰彿")
private String batch;
/**
* 鍗曟嵁缂栧彿
*/
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+ @ApiModelProperty(value = "鍗曟嵁缂栧彿")
@TableField("order_no")
private String orderNo;
/**
* 瑙勬牸
*/
- @ApiModelProperty(value= "瑙勬牸")
+ @ApiModelProperty(value = "瑙勬牸")
private String specs;
/**
* 鍨嬪彿
*/
- @ApiModelProperty(value= "鍨嬪彿")
+ @ApiModelProperty(value = "鍨嬪彿")
private String model;
/**
* 棰滆壊
*/
- @ApiModelProperty(value= "棰滆壊")
+ @ApiModelProperty(value = "棰滆壊")
private String color;
/**
* 鍝佺墝
*/
- @ApiModelProperty(value= "鍝佺墝")
+ @ApiModelProperty(value = "鍝佺墝")
private String brand;
/**
* 鍗曚綅
*/
- @ApiModelProperty(value= "鍗曚綅")
+ @ApiModelProperty(value = "鍗曚綅")
private String unit;
/**
* 鍗曚环
*/
- @ApiModelProperty(value= "鍗曚环")
+ @ApiModelProperty(value = "鍗曚环")
private Double price;
/**
* sku
*/
- @ApiModelProperty(value= "sku")
+ @ApiModelProperty(value = "sku")
private String sku;
/**
* 鍗曚綅閲�
*/
- @ApiModelProperty(value= "鍗曚綅閲�")
+ @ApiModelProperty(value = "鍗曚綅閲�")
private Double units;
/**
* 鏉＄爜
*/
- @ApiModelProperty(value= "鏉＄爜")
+ @ApiModelProperty(value = "鏉＄爜")
private String barcode;
/**
* 浜у湴
*/
- @ApiModelProperty(value= "浜у湴")
+ @ApiModelProperty(value = "浜у湴")
private String origin;
/**
* 鍘傚
*/
- @ApiModelProperty(value= "鍘傚")
+ @ApiModelProperty(value = "鍘傚")
private String manu;
/**
* 鐢熶骇鏃ユ湡
*/
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+ @ApiModelProperty(value = "鐢熶骇鏃ユ湡")
@TableField("manu_date")
private String manuDate;
/**
* 鍝侀」鏁�
*/
- @ApiModelProperty(value= "鍝侀」鏁�")
+ @ApiModelProperty(value = "鍝侀」鏁�")
@TableField("item_num")
private String itemNum;
/**
* 瀹夊叏搴撳瓨閲�
*/
- @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
+ @ApiModelProperty(value = "瀹夊叏搴撳瓨閲�")
@TableField("safe_qty")
private Double safeQty;
/**
* 閲嶉噺
*/
- @ApiModelProperty(value= "閲嶉噺")
+ @ApiModelProperty(value = "閲嶉噺")
private Double weight;
/**
* 闀垮害
*/
- @ApiModelProperty(value= "闀垮害")
+ @ApiModelProperty(value = "闀垮害")
@TableField("man_length")
private Double manLength;
/**
* 浣撶Н
*/
- @ApiModelProperty(value= "浣撶Н")
+ @ApiModelProperty(value = "浣撶Н")
private Double volume;
/**
* 涓夋柟缂栫爜
*/
- @ApiModelProperty(value= "涓夋柟缂栫爜")
+ @ApiModelProperty(value = "涓夋柟缂栫爜")
@TableField("three_code")
private String threeCode;
/**
* 渚涘簲鍟�
*/
- @ApiModelProperty(value= "渚涘簲鍟�")
+ @ApiModelProperty(value = "渚涘簲鍟�")
private String supp;
/**
* 渚涘簲鍟嗙紪鐮�
*/
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+ @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
@TableField("supp_code")
private String suppCode;
/**
* 鏄惁鎵规 1: 鏄� 0: 鍚�
*/
- @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "鏄惁鎵规 1: 鏄� 0: 鍚� ")
@TableField("be_batch")
private Integer beBatch;
/**
* 淇濊川鏈�
*/
- @ApiModelProperty(value= "淇濊川鏈�")
+ @ApiModelProperty(value = "淇濊川鏈�")
@TableField("dead_time")
private String deadTime;
/**
* 棰勮澶╂暟
*/
- @ApiModelProperty(value= "棰勮澶╂暟")
+ @ApiModelProperty(value = "棰勮澶╂暟")
@TableField("dead_warn")
private Integer deadWarn;
/**
* 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗
*/
- @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ @ApiModelProperty(value = "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
private Integer source;
/**
* 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
*/
- @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
private Integer inspect;
/**
* 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
*/
- @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
private Integer danger;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
/**
+ * 澶囩敤1
+ */
+ @ApiModelProperty(value = "澶囩敤1")
+ private String standby1 = "";
+
+ /**
+ * 澶囩敤2
+ */
+ @ApiModelProperty(value = "澶囩敤2")
+ private String standby2 = "";
+
+ /**
+ * 澶囩敤3
+ */
+ @ApiModelProperty(value = "澶囩敤3")
+ private String standby3 = "";
+
+ /**
+ * 澶囩敤1
+ */
+ @ApiModelProperty(value = "澶囩敤1")
+ @TableField("box_type1")
+ private String boxType1 = "";
+
+ /**
+ * 澶囩敤2
+ */
+ @ApiModelProperty(value = "澶囩敤2")
+ @TableField("box_type2")
+ private String boxType2 = "";
+
+ /**
+ * 澶囩敤3
+ */
+ @ApiModelProperty(value = "澶囩敤3")
+ @TableField("box_type3")
+ private String boxType3 = "";
+
+ /**
* 搴撳瓨
*/
@ApiModelProperty(value = "搴撳瓨")
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index 06f6295..47eb884 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -6,24 +6,51 @@
<resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkDetl">
<result column="wrk_no" property="wrkNo" />
<result column="io_time" property="ioTime" />
+ <result column="anfme" property="anfme" />
+ <result column="zpallet" property="zpallet" />
<result column="matnr" property="matnr" />
<result column="maktx" property="maktx" />
+ <result column="batch" property="batch" />
+ <result column="order_no" property="orderNo" />
+
<result column="specs" property="specs" />
- <result column="size" property="size" />
+ <result column="model" property="model" />
<result column="color" property="color" />
- <result column="weight" property="weight" />
- <result column="bill_no" property="billNo" />
- <result column="seq_no" property="seqNo" />
<result column="brand" property="brand" />
- <result column="anfme" property="anfme" />
<result column="unit" property="unit" />
- <result column="zpallet" property="zpallet" />
- <result column="bname" property="bname" />
- <result column="memo" property="memo" />
+ <result column="price" property="price" />
+ <result column="sku" property="sku" />
+ <result column="units" property="units" />
+ <result column="barcode" property="barcode" />
+ <result column="origin" property="origin" />
+ <result column="manu" property="manu" />
+ <result column="manu_date" property="manuDate" />
+ <result column="item_num" property="itemNum" />
+ <result column="safe_qty" property="safeQty" />
+ <result column="weight" property="weight" />
+ <result column="man_length" property="manLength" />
+ <result column="volume" property="volume" />
+ <result column="three_code" property="threeCode" />
+ <result column="supp" property="supp" />
+ <result column="supp_code" property="suppCode" />
+ <result column="be_batch" property="beBatch" />
+ <result column="dead_time" property="deadTime" />
+ <result column="dead_warn" property="deadWarn" />
+ <result column="source" property="source" />
+ <result column="inspect" property="inspect" />
+ <result column="danger" property="danger" />
+
<result column="modi_user" property="modiUser" />
<result column="modi_time" property="modiTime" />
<result column="appe_user" property="appeUser" />
<result column="appe_time" property="appeTime" />
+ <result column="memo" property="memo" />
+ <result column="standby1" property="standby1" />
+ <result column="standby2" property="standby2" />
+ <result column="standby3" property="standby3" />
+ <result column="box_type1" property="boxType1" />
+ <result column="box_type2" property="boxType2" />
+ <result column="box_type3" property="boxType3" />
<result column="stock_num" property="stockNum" />
</resultMap>
--
Gitblit v1.9.1