From 2fc66774335bfc603aa36b1ca41e5f1be19442b0 Mon Sep 17 00:00:00 2001
From: bfwms <1>
Date: 星期一, 07 七月 2025 16:27:05 +0800
Subject: [PATCH] ERP对接

---
 src/main/java/com/zy/asrs/entity/OrderDetl.java |   92 ++++++++++++++++++++++++++--------------------
 1 files changed, 52 insertions(+), 40 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 313fe0f..3cc397c 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -7,6 +7,7 @@
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
 import com.zy.asrs.service.LocDetlService;
+import com.zy.asrs.service.LocOwnerService;
 import com.zy.asrs.service.OrderDetlService;
 import com.zy.asrs.service.OrderService;
 import com.zy.common.utils.Synchro;
@@ -76,9 +77,9 @@
     private String maktx;
 
     /**
-     * 搴忓垪鐮�
+     * 鎵瑰彿
      */
-    @ApiModelProperty(value= "搴忓垪鐮�")
+    @ApiModelProperty(value= "鎵瑰彿")
     private String batch;
 
     /**
@@ -88,28 +89,59 @@
     private String specs;
 
     /**
-     * 鍨嬪彿
+     * 缁勭粐缂栫爜
      */
-    @ApiModelProperty(value= "鍨嬪彿")
+    @ApiModelProperty(value= "缁勭粐缂栫爜")
+    private String manu;
+
+    /**
+     * 椤规
+     */
+    @ApiModelProperty(value= "椤规")
     private String model;
 
     /**
-     * 棰滆壊
+     * 浠诲姟浠撳簱
      */
-    @ApiModelProperty(value= "棰滆壊")
+    @ApiModelProperty(value= "浠诲姟浠撳簱")
     private String color;
 
     /**
-     * 鍝佺墝
+     * 浠诲姟鍌ㄤ綅
      */
-    @ApiModelProperty(value= "鍝佺墝")
+    @ApiModelProperty(value= "浠诲姟鍌ㄤ綅")
     private String brand;
 
     /**
-     * 鍗曚綅
+     * 鍗曚綅缂栫爜
      */
-    @ApiModelProperty(value= "鍗曚綅")
+    @ApiModelProperty(value= "鍗曚綅缂栫爜")
     private String unit;
+
+    /**
+     * 鍗曚綅鍚嶇О
+     */
+    @ApiModelProperty(value= "鍗曚綅鍚嶇О")
+    private String sku;
+
+    /**
+     * 渚涘簲鍟嗙紪鐮�
+     */
+    @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+    @TableField("item_num")
+    private String itemNum;
+
+    /**
+     * 鎵樼洏鐮�
+     */
+    @ApiModelProperty(value= "鎵樼洏鐮�")
+    private String barcode;
+
+    /**
+     * 渚涘簲鍟嗗悕绉�
+     */
+    @ApiModelProperty(value= "渚涘簲鍟嗗悕绉�")
+    private String origin;
 
     /**
      * 鍗曚环
@@ -118,34 +150,11 @@
     private Double price;
 
     /**
-     * sku
-     */
-    @ApiModelProperty(value= "sku")
-    private String sku;
-
-    /**
      * 鍗曚綅閲�
      */
     @ApiModelProperty(value= "鍗曚綅閲�")
     private Double units;
 
-    /**
-     * 鏉＄爜
-     */
-    @ApiModelProperty(value= "鏉＄爜")
-    private String barcode;
-
-    /**
-     * 浜у湴
-     */
-    @ApiModelProperty(value= "浜у湴")
-    private String origin;
-
-    /**
-     * 鍘傚
-     */
-    @ApiModelProperty(value= "鍘傚")
-    private String manu;
 
     /**
      * 鐢熶骇鏃ユ湡
@@ -153,13 +162,6 @@
     @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
     @TableField("manu_date")
     private String manuDate;
-
-    /**
-     * 鍝侀」鏁�
-     */
-    @ApiModelProperty(value= "鍝侀」鏁�")
-    @TableField("item_num")
-    private String itemNum;
 
     /**
      * 瀹夊叏搴撳瓨閲�
@@ -340,6 +342,16 @@
         this.memo = memo;
     }
 
+    public String getOwner$(){
+        LocOwnerService service = SpringUtils.getBean(LocOwnerService.class);
+        LocOwner locOwner = service.selectById(this.owner);
+        if (!Cools.isEmpty(locOwner)){
+            return String.valueOf(locOwner.getOwner());
+        }
+        return null;
+    }
+
+
     public String getOrderId$(){
         OrderService service = SpringUtils.getBean(OrderService.class);
         Order order = service.selectById(this.orderId);

--
Gitblit v1.9.1