From 48d6b46ef23a321cc70e20d36a2b3bf721d05206 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 29 四月 2026 15:45:57 +0800
Subject: [PATCH] 电视机显示屏曲线图改成7天
---
src/main/java/com/zy/asrs/entity/OrderDetlPakout.java | 198 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 193 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
index c26b06d..cafd870 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.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;
@@ -186,7 +189,8 @@
* 闀垮害
*/
@ApiModelProperty(value= "闀垮害")
- private Double length;
+ @TableField("man_length")
+ private Double manLength;
/**
* 浣撶Н
@@ -307,11 +311,161 @@
*/
@ApiModelProperty(value= "琛屽彿")
@TableField("line_number")
- private Integer lineNumber;
+ private Long lineNumber;
+
+ /**
+ * 澶囩敤1
+ */
+ @ApiModelProperty(value= "澶囩敤1")
+ private String standby1 = "1";
+
+ /**
+ * 澶囩敤2
+ */
+ @ApiModelProperty(value= "澶囩敤2")
+ private String standby2 = "1";
+
+ /**
+ * 澶囩敤3
+ */
+ @ApiModelProperty(value= "澶囩敤3")
+ private String standby3 = "1";
+
+ /**
+ * 澶囩敤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";
+
+ /**
+ * 瀹藉害
+ */
+ @ApiModelProperty(value= "瀹藉害")
+ @TableField("width")
+ private Double width;
+
+ /**
+ * 楂樺害
+ */
+ @ApiModelProperty(value= "楂樺害")
+ @TableField("height")
+ private Double height;
+
+ /**
+ * erp鏁伴噺
+ */
+ @ApiModelProperty(value= "erp鏁伴噺")
+ @TableField("erp_anfme")
+ private Double erpAnfme;
+
+
+ /**
+ * 鏁伴噺
+ */
+ @ApiModelProperty(value= "涓嬪彂鍒嗘嫞绾挎暟閲�")
+ @TableField("sorting_anfme")
+ private Double sortingAnfme;
+
+ /**
+ * 鍚岃鍗曚腑鎵规鏍囪瘑
+ */
+ @ApiModelProperty(value= "鍚岃鍗曚腑鎵规鏍囪瘑")
+ @TableField("batch_seq")
+ private String batchSeq;
+
+ /**
+ * 鍑哄簱椤哄簭
+ */
+ @ApiModelProperty(value= "鍑哄簱椤哄簭")
+ private Integer seq;
+
+ /**
+ * 鎵樼洏缂栫爜
+ */
+ @ApiModelProperty(value= "鎵樼洏缂栫爜")
+ @TableField("pallet_id")
+ private String palletId;
+
+ /**
+ * 鍑哄簱鍙ｇ紪鐮�
+ */
+ @ApiModelProperty(value= "鍑哄簱鍙ｇ紪鐮�")
+ @TableField("station_id")
+ private String stationId;
+
+ /**
+ * 杩涗粨缂栧彿
+ */
+ @ApiModelProperty(value= "杩涗粨缂栧彿")
+ @TableField("entry_wms_code")
+ private String entryWmsCode;
+
+ /**
+ * 闆嗚绠卞彿
+ */
+ @ApiModelProperty(value= "闆嗚绠卞彿")
+ @TableField("container_no")
+ private String containerNo;
+
+ /**
+ * 澶栧簱闂ㄥ彿
+ */
+ @ApiModelProperty(value= "澶栧簱闂ㄥ彿")
+ @TableField("out_door_no")
+ private String outDoorNo;
+
+ /**
+ * 杞︾墝鍙�
+ */
+ @ApiModelProperty(value= "杞︾墝鍙�")
+ @TableField("plate_no")
+ private String plateNo;
+
+ /**
+ * 杞︽鍙�
+ */
+ @ApiModelProperty(value= "杞︽鍙�")
+ @TableField("train_no")
+ private String trainNo;
+
+ /**
+ * 璐х墿棰戞
+ */
+ @ApiModelProperty(value= "璐х墿棰戞")
+ @TableField("freq_type")
+ private Integer freqType;
+
+ /**
+ * 绔嬫柟鏁�
+ */
+ @ApiModelProperty(value= "绔嬫柟鏁�")
+ @TableField("cube_number")
+ private Double cubeNumber;
+
+ /**
+ * TEU
+ */
+ @ApiModelProperty(value= "TEU")
+ private Integer teu;
public OrderDetlPakout() {}
- public OrderDetlPakout(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 OrderDetlPakout(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 +488,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;
@@ -434,6 +588,7 @@
}
public String getPakinPakoutStatus$(){
+ if (Cools.isEmpty(this.pakinPakoutStatus)) return null;
switch (this.pakinPakoutStatus){
case 1:
return "Y";
@@ -485,8 +640,41 @@
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(OrderDetlPakout orderDetlPakout){
+ return (
+ this.orderNo.equals(orderDetlPakout.getOrderNo())
+ && this.matnr.equals(orderDetlPakout.getMatnr())
+ && this.batch.equals(orderDetlPakout.getBatch())
+ && this.brand.equals(orderDetlPakout.getBrand())
+ && this.standby1.equals(orderDetlPakout.getStandby1())
+ && this.standby2.equals(orderDetlPakout.getStandby2())
+ && this.standby3.equals(orderDetlPakout.getStandby3())
+ && this.boxType1.equals(orderDetlPakout.getBoxType1())
+ && this.boxType2.equals(orderDetlPakout.getBoxType2())
+ && this.boxType3.equals(orderDetlPakout.getBoxType3())
+ );
+ }
+
public void sync(Object source) {
Synchro.Copy(source, this);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1