From e85f0e74d21e49b9c68474bc4d19f5eceacf1a46 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 20 十月 2025 08:40:04 +0800
Subject: [PATCH] 对接

---
 src/main/java/com/zy/asrs/entity/WrkDetlLog.java |   75 ++++++++++++++++++++++++++++++++++++-
 1 files changed, 72 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index 635c2e0..f7a1962 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -2,8 +2,12 @@
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
+import com.zy.asrs.service.KcztMapService;
+import com.zy.asrs.service.StoreTypeService;
+import com.zy.common.utils.Synchro;
 import com.zy.system.entity.User;
 import com.zy.system.service.UserService;
 import io.swagger.annotations.ApiModelProperty;
@@ -273,19 +277,64 @@
      * 澶囩敤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 = "";
+
+    /**
+     * 澶囩敤2
+     */
+    @ApiModelProperty(value= "澶囩敤2")
+    @TableField("box_type2")
+    private String boxType2 = "";
+
+    /**
+     * 澶囩敤3
+     */
+    @ApiModelProperty(value= "澶囩敤3")
+    @TableField("box_type3")
+    private String boxType3 = "";
+
+    /**
+     * 搴撳瓨
+     */
+    @ApiModelProperty(value = "搴撳瓨")
+    @TableField("stock_num")
+    private Double stockNum;
+
+    /**
+     * 寮�绁ㄥ鎴峰悕绉�
+     */
+    @ApiModelProperty(value = "寮�绁ㄥ鎴峰悕绉�")
+    @TableField("kp_cstmr_name")
+    private String kpCstmrName;
+
+    /**
+     * 杈呭簱瀛�
+     */
+    @ApiModelProperty(value = "杈呭簱瀛�")
+    @TableField("stock_num2")
+    private Double stockNum2;
+
+    //搴撳瓨鐘舵��
+    private String cstateid;
 
     public String getIoTime$(){
         if (Cools.isEmpty(this.ioTime)){
@@ -376,5 +425,25 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
     }
 
+    public String getStandby1$() {
+        StoreTypeService service = SpringUtils.getBean(StoreTypeService.class);
+        StoreType storeType = service.selectById(this.standby1);
+        if (!Cools.isEmpty(storeType)) {
+            return String.valueOf(storeType.getStoreName());
+        }
+        return null;
+    }
 
+    public String getCstateid$() {
+        KcztMapService service = SpringUtils.getBean(KcztMapService.class);
+        KcztMap kcztMap = service.selectOne(new EntityWrapper<KcztMap>().eq("cstateid", this.cstateid));
+        if (!Cools.isEmpty(kcztMap)){
+            return String.valueOf(kcztMap.getVname());
+        }
+        return String.valueOf(this.cstateid);
+    }
+
+    public void sync(Object source) {
+        Synchro.Copy(source, this);
+    }
 }

--
Gitblit v1.9.1