From 285deae97a62db611ee2485d3940e24307594f2a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 22 九月 2025 20:09:42 +0800
Subject: [PATCH] 数据结构修改 任务工作档修改 组托工作档修改
---
src/main/java/com/zy/asrs/entity/OrderDetlPakin.java | 90 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 83 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
index f9ecc5b..935e58b 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
@@ -4,8 +4,11 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.asrs.service.BasProcessProceduresService;
+import com.zy.asrs.service.BasQualityTestingService;
import com.zy.asrs.service.OrderService;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
@@ -17,6 +20,7 @@
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.Objects;
@Data
@TableName("man_order_detl_pakin")
@@ -186,7 +190,8 @@
* 闀垮害
*/
@ApiModelProperty(value= "闀垮害")
- private Double length;
+ @TableField("man_length")
+ private Double manLength;
/**
* 浣撶Н
@@ -307,11 +312,50 @@
*/
@ApiModelProperty(value= "琛屽彿")
@TableField("line_number")
- private Integer lineNumber;
+ private Long lineNumber;
+
+ /**
+ * 澶囩敤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 = "1";
+
+ /**
+ * 澶囩敤2
+ */
+ @ApiModelProperty(value= "澶囩敤2")
+ @TableField("box_type2")
+ private String boxType2 = "1";
+
+ /**
+ * 澶囩敤3
+ */
+ @ApiModelProperty(value= "澶囩敤3")
+ @TableField("box_type3")
+ private String boxType3 = "1";
public OrderDetlPakin() {}
- public OrderDetlPakin(Long orderId, String orderNo, Double anfme, Double qty, String matnr, String maktx, String batch, 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, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
+ public OrderDetlPakin(Long orderId, String orderNo, Double anfme, Double qty, String matnr, String maktx, String batch, 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 manLength, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
this.orderId = orderId;
this.orderNo = orderNo;
this.anfme = anfme;
@@ -334,7 +378,7 @@
this.itemNum = itemNum;
this.safeQty = safeQty;
this.weight = weight;
- this.length = length;
+ this.manLength = manLength;
this.volume = volume;
this.threeCode = threeCode;
this.supp = supp;
@@ -375,6 +419,7 @@
}
public String getPakinPakoutStatus$(){
+ if (Objects.isNull(pakinPakoutStatus)) {return null;}
switch (this.pakinPakoutStatus){
case 1:
return "Y";
@@ -424,6 +469,7 @@
}
}
+
public String getStatus$(){
if (null == this.status){ return null; }
switch (this.status){
@@ -472,9 +518,6 @@
if (null != this.anfme && this.workQty != null) {
return this.anfme - this.workQty;
}
-// if (null != this.anfme && this.qty != null) {
-// return this.anfme - this.qty;
-// }
return null;
}
@@ -485,6 +528,39 @@
return "鏈畬鎴�";
}
+ public String getBoxType1$(){
+ BasProcessProceduresService service = SpringUtils.getBean(BasProcessProceduresService.class);
+ BasProcessProcedures processProcedures = service.selectOne(new EntityWrapper<BasProcessProcedures>().eq("box_type", this.boxType1));
+ if (!Cools.isEmpty(processProcedures)){
+ return String.valueOf(processProcedures.getBoxSpecs());
+ }
+ return this.boxType1;
+ }
+
+ public String getBoxType2$(){
+ BasQualityTestingService service = SpringUtils.getBean(BasQualityTestingService.class);
+ BasQualityTesting basQualityTesting = service.selectOne(new EntityWrapper<BasQualityTesting>().eq("box_type", this.boxType1));
+ if (!Cools.isEmpty(basQualityTesting)){
+ return String.valueOf(basQualityTesting.getBoxSpecs());
+ }
+ return this.boxType1;
+ }
+
+ public boolean beSimilar(OrderDetlPakin orderDetlPakin){
+ return (
+ this.orderNo.equals(orderDetlPakin.getOrderNo())
+ && this.matnr.equals(orderDetlPakin.getMatnr())
+ && this.batch.equals(orderDetlPakin.getBatch())
+ && this.brand.equals(orderDetlPakin.getBrand())
+ && this.standby1.equals(orderDetlPakin.getStandby1())
+ && this.standby2.equals(orderDetlPakin.getStandby2())
+ && this.standby3.equals(orderDetlPakin.getStandby3())
+ && this.boxType1.equals(orderDetlPakin.getBoxType1())
+ && this.boxType2.equals(orderDetlPakin.getBoxType2())
+ && this.boxType3.equals(orderDetlPakin.getBoxType3())
+ );
+ }
+
public void sync(Object source) {
Synchro.Copy(source, this);
}
--
Gitblit v1.9.1