From 083841bb6c40097e19b17022454fcc7f12b7f092 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期六, 02 八月 2025 08:59:49 +0800
Subject: [PATCH] 1.更换订单出库策略，走托盘多的物料先出 2.完善出库作业工作档丢失导致出库站电视机不显示
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakin.java | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakin.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakin.java
index bdc5ed7..56afcf7 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakin.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WaitPakin.java
@@ -2,14 +2,13 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.zy.asrs.common.utils.Synchro;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -263,9 +262,18 @@
@ApiModelProperty(value= "鎺堟潈鍟嗘埛")
private Long hostId;
+ /**
+ * 婊℃澘(checkBox)
+ */
+ @ApiModelProperty(value= "婊℃澘(checkBox)")
+ private String fullPlt;
+
+ @ApiModelProperty(value= "璐т富")
+ private String owner;
+
public WaitPakin() {}
- public WaitPakin(String zpallet,Double anfme,String locNo,String matnr,String maktx,String batch,String orderNo,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,String status,String ioStatus,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String memo,Long hostId) {
+ public WaitPakin(String zpallet,Double anfme,String locNo,String matnr,String maktx,String batch,String orderNo,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,String status,String ioStatus,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String memo,Long hostId,String owner) {
this.zpallet = zpallet;
this.anfme = anfme;
this.locNo = locNo;
@@ -307,6 +315,7 @@
this.appeTime = appeTime;
this.memo = memo;
this.hostId = hostId;
+ this.owner = owner;
}
// WaitPakin waitPakin = new WaitPakin(
@@ -362,6 +371,19 @@
return "鍚�";
default:
return String.valueOf(this.beBatch);
+ }
+ }
+
+
+ public String getFullPlt$(){
+ if (null == this.fullPlt){ return null; }
+ switch (this.fullPlt){
+ case "Y":
+ return "鏄�";
+ case "N":
+ return "鍚�";
+ default:
+ return String.valueOf(this.fullPlt);
}
}
@@ -426,5 +448,8 @@
return null;
}
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
}
--
Gitblit v1.9.1