From 7cf2e143941e1548cc468992ada42106a27805a1 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期二, 09 十二月 2025 19:22:40 +0800
Subject: [PATCH] Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms

---
 src/main/java/com/zy/asrs/entity/WaitPakin.java |   80 +++++++++++++++++++++++++++++++++++++---
 1 files changed, 74 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index 799833a..06ae509 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -1,8 +1,14 @@
 package com.zy.asrs.entity;
 
 import com.baomidou.mybatisplus.annotations.TableField;
+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.common.utils.Synchro;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -17,6 +23,9 @@
 
     private static final long serialVersionUID = 1L;
 
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
     @ApiModelProperty(value= "鎵樼洏鏉＄爜")
     private String zpallet;
 
@@ -26,6 +35,10 @@
     @ApiModelProperty(value= "搴撲綅鍙�")
     @TableField("loc_no")
     private String locNo;
+
+    @ApiModelProperty("缁勬墭绫诲瀷")
+    @TableField("type")
+    private String type;
 
     @ApiModelProperty(value= "鍟嗗搧缂栧彿")
     private String matnr;
@@ -40,6 +53,10 @@
     @TableField("order_no")
     private String orderNo;
 
+    @ApiModelProperty("鍗曟嵁ID")
+    @TableField("order_id")
+    private Long orderId;
+
     @ApiModelProperty(value= "瑙勬牸")
     private String specs;
 
@@ -50,7 +67,7 @@
     private String color;
 
     @ApiModelProperty(value= "鍝佺墝")
-    private String brand;
+    private String brand = "";
 
     @ApiModelProperty(value= "鍗曚綅")
     private String unit;
@@ -156,19 +173,40 @@
      * 澶囩敤1
      */
     @ApiModelProperty(value= "澶囩敤1")
-    private String standby1;
+    private String standby1 = "";
 
     /**
      * 澶囩敤2
      */
     @ApiModelProperty(value= "澶囩敤2")
-    private String standby2;
+    private String standby2 = "";
 
     /**
      * 澶囩敤3
      */
     @ApiModelProperty(value= "澶囩敤3")
-    private String standby3;
+    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 String getBeBatch$(){
         if (null == this.beBatch){ return null; }
@@ -208,6 +246,18 @@
         }
     }
 
+    public String getType$(){
+        if (null == this.type){ return null; }
+        switch (this.type){
+            case "1":
+                return "AGV缁勬墭";
+            case "0":
+                return "鍫嗗灈鏈虹粍鎵�";
+            default:
+                return "鍫嗗灈鏈虹粍鎵�";
+        }
+    }
+
     public String getDanger$(){
         if (null == this.danger){ return null; }
         switch (this.danger){
@@ -234,7 +284,25 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
     }
 
-    public void sync(Object source) {
-        Synchro.Copy(source, this);
+    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 void sync(Object source) {
+//        Synchro.Copy(source, this);
+//    }
 }

--
Gitblit v1.9.1