From c688ad2d55d6a5355e0e75402177f3e7989600bc Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 08 一月 2025 16:10:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/java/com/zy/asrs/entity/ManLocDetl.java | 45 ++++++++-------------------------------------
1 files changed, 8 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/ManLocDetl.java b/src/main/java/com/zy/asrs/entity/ManLocDetl.java
index f738f2f..e630caf 100644
--- a/src/main/java/com/zy/asrs/entity/ManLocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/ManLocDetl.java
@@ -37,7 +37,6 @@
* 璐т綅缂栧彿
*/
@ApiModelProperty(value= "璐т綅缂栧彿")
- @TableId(value = "loc_no", type = IdType.INPUT)
@TableField("loc_no")
private String locNo;
@@ -215,44 +214,16 @@
@ApiModelProperty(value= "璐х墿褰㈡��:0锛氫唬閲囥��1锛氫粨鍌�")
private Integer payment;
- /**
- * uuid鏃堕棿鎴�
- */
- @ApiModelProperty(value= "uuid")
- @TableId(value = "uuid", type = IdType.ID_WORKER_STR)
- @TableField("uuid")
- private String uuid;
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @TableField("real_anfme")
+ private Date realAnfme;
- public ManLocDetl() {}
+ @ApiModelProperty(value= "璁㈠崟鍙�")
+ @TableField("order_no")
+ private String orderNo;
- public ManLocDetl(Long hostId, String locNo,Long nodeId,String zpallet,Double anfme,String matnr,String maktx,String name,String specs,String model,String batch,String unit,String barcode,Long docId,String docNum,String custName,Integer itemNum,Integer count,Double weight,Integer status,Long createBy,Date createTime,Long updateBy,Date modiTime,String memo,int owner ,int payment,String uuid) {
- this.hostId = hostId;
- this.nodeId = nodeId;
- this.zpallet = zpallet;
- this.anfme = anfme;
- this.maktx = maktx;
- this.name = name;
- this.specs = specs;
- this.model = model;
- this.batch = batch;
- this.unit = unit;
- this.barcode = barcode;
- this.docId = docId;
- this.docNum = docNum;
- this.custName = custName;
- this.itemNum = itemNum;
- this.count = count;
- this.weight = weight;
- this.status = status;
- this.createBy = createBy;
- this.createTime = createTime;
- this.updateBy = updateBy;
- this.modiTime = modiTime;
- this.memo = memo;
- this.owner = owner;
- this.payment = payment;
- this.uuid = uuid;
- }
+
+
// LocDetl locDetl = new LocDetl(
// null, // 璐т綅缂栧彿[闈炵┖]
--
Gitblit v1.9.1