From a3bea567c554c2c57809ceed2a040baf473aa95f Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期四, 27 三月 2025 13:04:38 +0800
Subject: [PATCH] 1
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/OrderDetlLog.java | 205 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 157 insertions(+), 48 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/OrderDetlLog.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/OrderDetlLog.java
index ca0af79..f9036f4 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/OrderDetlLog.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/OrderDetlLog.java
@@ -35,6 +35,7 @@
* ID
*/
@ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
@@ -44,10 +45,22 @@
private Long orderId;
/**
+ * 鍗曟嵁缂栧彿
+ */
+ @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+ private String orderNo;
+
+ /**
* 鏁伴噺
*/
@ApiModelProperty(value= "鏁伴噺")
private Double anfme;
+
+ @ApiModelProperty(value= "宸插畬鎴愭暟閲�")
+ private Double qty;
+
+ @ApiModelProperty(value= "浣滀笟鏁伴噺")
+ private Double workQty;
/**
* 鍟嗗搧缂栫爜
@@ -62,10 +75,10 @@
private String maktx;
/**
- * 鍚嶇О
+ * 鎵瑰彿
*/
- @ApiModelProperty(value= "鍚嶇О")
- private String name;
+ @ApiModelProperty(value= "鎵瑰彿")
+ private String batch;
/**
* 瑙勬牸
@@ -80,10 +93,16 @@
private String model;
/**
- * 鎵瑰彿
+ * 棰滆壊
*/
- @ApiModelProperty(value= "鎵瑰彿")
- private String batch;
+ @ApiModelProperty(value= "棰滆壊")
+ private String color;
+
+ /**
+ * 鍝佺墝
+ */
+ @ApiModelProperty(value= "鍝佺墝")
+ private String brand;
/**
* 鍗曚綅
@@ -92,40 +111,130 @@
private String unit;
/**
- * 鍟嗗搧鏉＄爜
- */
- @ApiModelProperty(value= "鍟嗗搧鏉＄爜")
- private String barcode;
-
- /**
- * 渚涘簲鍟�
- */
- @ApiModelProperty(value= "渚涘簲鍟�")
- private String supplier;
-
- /**
* 鍗曚环
*/
@ApiModelProperty(value= "鍗曚环")
- private Double unitPrice;
+ private Double price;
+
+ /**
+ * sku
+ */
+ @ApiModelProperty(value= "sku")
+ private String sku;
+
+ /**
+ * 鍗曚綅閲�
+ */
+ @ApiModelProperty(value= "鍗曚綅閲�")
+ private Double units;
+
+ /**
+ * 鏉＄爜
+ */
+ @ApiModelProperty(value= "鏉＄爜")
+ private String barcode;
+
+ /**
+ * 浜у湴
+ */
+ @ApiModelProperty(value= "浜у湴")
+ private String origin;
+
+ /**
+ * 鍘傚
+ */
+ @ApiModelProperty(value= "鍘傚")
+ private String manu;
+
+ /**
+ * 鐢熶骇鏃ユ湡
+ */
+ @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+ private String manuDate;
/**
* 鍝侀」鏁�
*/
@ApiModelProperty(value= "鍝侀」鏁�")
- private Integer itemNum;
+ private String itemNum;
/**
- * 鏁伴噺
+ * 瀹夊叏搴撳瓨閲�
*/
- @ApiModelProperty(value= "鏁伴噺")
- private Double count;
+ @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
+ private Double safeQty;
/**
* 閲嶉噺
*/
@ApiModelProperty(value= "閲嶉噺")
private Double weight;
+
+ /**
+ * 闀垮害
+ */
+ @ApiModelProperty(value= "闀垮害")
+ private Double length;
+
+ /**
+ * 浣撶Н
+ */
+ @ApiModelProperty(value= "浣撶Н")
+ private Double volume;
+
+ /**
+ * 浠撳簱鍙�
+ */
+ @ApiModelProperty(value= "浠撳簱鍙�")
+ private String threeCode;
+
+ /**
+ * 鏉ユ簮鍗曞彿
+ */
+ @ApiModelProperty(value= "鏉ユ簮鍗曞彿")
+ private String supp;
+
+ /**
+ * 鏉ユ簮搴忓彿
+ */
+ @ApiModelProperty(value= "鏉ユ簮搴忓彿")
+ private String suppCode;
+
+ /**
+ * 鏄惁鎵规 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
+ private Integer beBatch;
+
+ /**
+ * 淇濊川鏈�
+ */
+ @ApiModelProperty(value= "淇濊川鏈�")
+ private String deadTime;
+
+ /**
+ * 棰勮澶╂暟
+ */
+ @ApiModelProperty(value= "棰勮澶╂暟")
+ private Integer deadWarn;
+
+ /**
+ * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗
+ */
+ @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ private Integer source;
+
+ /**
+ * 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ private Integer inspect;
+
+ /**
+ * 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ private Integer danger;
/**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
@@ -173,31 +282,31 @@
public OrderDetlLog() {}
- public OrderDetlLog(Long id,Long orderId,Double anfme,String matnr,String maktx,String name,String specs,String model,String batch,String unit,String barcode,String supplier,Double unitPrice,Integer itemNum,Double count,Double weight,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Long hostId) {
- this.id = id;
- this.orderId = orderId;
- this.anfme = anfme;
- this.matnr = matnr;
- this.maktx = maktx;
- this.name = name;
- this.specs = specs;
- this.model = model;
- this.batch = batch;
- this.unit = unit;
- this.barcode = barcode;
- this.supplier = supplier;
- this.unitPrice = unitPrice;
- this.itemNum = itemNum;
- this.count = count;
- this.weight = weight;
- this.status = status;
- this.createBy = createBy;
- this.createTime = createTime;
- this.updateBy = updateBy;
- this.updateTime = updateTime;
- this.memo = memo;
- this.hostId = hostId;
- }
+// public OrderDetlLog(Long id,Long orderId,Double anfme,String matnr,String maktx,String name,String specs,String model,String batch,String unit,String barcode,String supplier,Double unitPrice,Integer itemNum,Double count,Double weight,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Long hostId) {
+// this.id = id;
+// this.orderId = orderId;
+// this.anfme = anfme;
+// this.matnr = matnr;
+// this.maktx = maktx;
+// this.name = name;
+// this.specs = specs;
+// this.model = model;
+// this.batch = batch;
+// this.unit = unit;
+// this.barcode = barcode;
+// this.supplier = supplier;
+// this.unitPrice = unitPrice;
+// this.itemNum = itemNum;
+// this.count = count;
+// this.weight = weight;
+// this.status = status;
+// this.createBy = createBy;
+// this.createTime = createTime;
+// this.updateBy = updateBy;
+// this.updateTime = updateTime;
+// this.memo = memo;
+// this.hostId = hostId;
+// }
// OrderDetlLog orderDetlLog = new OrderDetlLog(
// null, // ID[闈炵┖]
--
Gitblit v1.9.1