From a1f5c7974cb66943c2d0edd285902bc34c4294c8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 15 四月 2025 17:29:06 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/OrderItem.java |  333 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 333 insertions(+), 0 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/OrderItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/OrderItem.java
new file mode 100644
index 0000000..7ed3564
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/OrderItem.java
@@ -0,0 +1,333 @@
+package com.vincent.rsf.server.manager.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.vincent.rsf.framework.common.Cools;
+import com.vincent.rsf.framework.common.SpringUtils;
+import com.vincent.rsf.server.system.service.UserService;
+import com.vincent.rsf.server.system.entity.User;
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@Accessors(chain = true)
+@TableName("man_order_item")
+public class OrderItem implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ApiModelProperty(value= "ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 涓诲崟ID
+     */
+    @ApiModelProperty(value= "涓诲崟ID")
+    private Long orderId;
+
+    /**
+     * 涓诲崟缂栧彿
+     */
+    @ApiModelProperty(value= "涓诲崟缂栧彿")
+    private String orderCode;
+
+    /**
+     * 缂栧彿
+     */
+    @ApiModelProperty(value= "缂栧彿")
+    private String sourceItemId;
+
+    /**
+     * 鐗╂枡ID
+     */
+    @ApiModelProperty(value= "鐗╂枡ID")
+    private String matnrId;
+
+    /**
+     * 鐗╂枡缂栫爜
+     */
+    @ApiModelProperty(value= "鐗╂枡缂栫爜")
+    private String matnrCode;
+
+    /**
+     * 鐗╂枡鍚嶇О
+     */
+    @ApiModelProperty(value= "鐗╂枡鍚嶇О")
+    private String maktx;
+
+    /**
+     * 閫佽揣鏁伴噺
+     */
+    @ApiModelProperty(value= "閫佽揣鏁伴噺")
+    private Double anfme;
+
+    /**
+     * 搴撳瓨鍗曚綅
+     */
+    @ApiModelProperty(value= "搴撳瓨鍗曚綅")
+    private String stockUnit;
+
+    /**
+     * 鎵ц涓暟閲�
+     */
+    @ApiModelProperty(value= "鎵ц涓暟閲�")
+    private Double workQty;
+
+    /**
+     * 閲囪喘鏁伴噺
+     */
+    @ApiModelProperty(value= "閲囪喘鏁伴噺")
+    private Double purQty;
+
+    /**
+     * 閲囪喘鍗曚綅
+     */
+    @ApiModelProperty(value= "閲囪喘鍗曚綅")
+    private String purUnit;
+
+    /**
+     * 宸叉敹鏁伴噺
+     */
+    @ApiModelProperty(value= "宸叉敹鏁伴噺")
+    private Double qty;
+
+    /**
+     * 渚涘簲鍟嗙紪鐮�
+     */
+    @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+    private String splrCode;
+
+    /**
+     * 搴撳瓨鎵规
+     */
+    @ApiModelProperty(value= "搴撳瓨鎵规")
+    private String batch;
+
+    /**
+     * 渚涘簲鍟嗘壒娆�
+     */
+    @ApiModelProperty(value= "渚涘簲鍟嗘壒娆�")
+    private String splrBatch;
+
+    /**
+     * 渚涘簲鍟嗗悕绉�
+     */
+    @ApiModelProperty(value= "渚涘簲鍟嗗悕绉�")
+    private String splrName;
+
+    /**
+     * 璺熻釜鐮�
+     */
+    @ApiModelProperty(value= "璺熻釜鐮�")
+    private String trackCode;
+
+    /**
+     * 鏉″舰鐮�
+     */
+    @ApiModelProperty(value= "鏉″舰鐮�")
+    private String barcode;
+
+    /**
+     * 鐢熶骇鏃ユ湡
+     */
+    @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+    private String prodTime;
+
+    /**
+     * 鍖呰鍚嶇О
+     */
+    @ApiModelProperty(value= "鍖呰鍚嶇О")
+    private String packName;
+
+    /**
+     * 鐘舵�� 1: 姝e父  0: 鍐荤粨  
+     */
+    @ApiModelProperty(value= "鐘舵�� 1: 姝e父  0: 鍐荤粨  ")
+    private Integer status;
+
+    /**
+     * 鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  
+     */
+    @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  ")
+    @TableLogic
+    private Integer deleted;
+
+    /**
+     * 绉熸埛
+     */
+    @ApiModelProperty(value= "绉熸埛")
+    private Integer tenantId;
+
+    /**
+     * 娣诲姞浜哄憳
+     */
+    @ApiModelProperty(value= "娣诲姞浜哄憳")
+    private Long createBy;
+
+    /**
+     * 娣诲姞鏃堕棿
+     */
+    @ApiModelProperty(value= "娣诲姞鏃堕棿")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /**
+     * 淇敼浜哄憳
+     */
+    @ApiModelProperty(value= "淇敼浜哄憳")
+    private Long updateBy;
+
+    /**
+     * 淇敼鏃堕棿
+     */
+    @ApiModelProperty(value= "淇敼鏃堕棿")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /**
+     * 澶囨敞
+     */
+    @ApiModelProperty(value= "澶囨敞")
+    private String memo;
+
+    public OrderItem() {}
+
+    public OrderItem(Long orderId,String orderCode,String sourceItemId,String matnrId,String matnrCode,String maktx,Double anfme,String stockUnit,Double workQty,Double purQty,String purUnit,Double qty,String splrCode,String batch,String splrBatch,String splrName,String trackCode,String barcode,String prodTime,String packName,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+        this.orderId = orderId;
+        this.orderCode = orderCode;
+        this.sourceItemId = sourceItemId;
+        this.matnrId = matnrId;
+        this.matnrCode = matnrCode;
+        this.maktx = maktx;
+        this.anfme = anfme;
+        this.stockUnit = stockUnit;
+        this.workQty = workQty;
+        this.purQty = purQty;
+        this.purUnit = purUnit;
+        this.qty = qty;
+        this.splrCode = splrCode;
+        this.batch = batch;
+        this.splrBatch = splrBatch;
+        this.splrName = splrName;
+        this.trackCode = trackCode;
+        this.barcode = barcode;
+        this.prodTime = prodTime;
+        this.packName = packName;
+        this.status = status;
+        this.deleted = deleted;
+        this.tenantId = tenantId;
+        this.createBy = createBy;
+        this.createTime = createTime;
+        this.updateBy = updateBy;
+        this.updateTime = updateTime;
+        this.memo = memo;
+    }
+
+//    OrderItem orderItem = new OrderItem(
+//            null,    // 涓诲崟ID
+//            null,    // 涓诲崟缂栧彿
+//            null,    // 缂栧彿
+//            null,    // 鐗╂枡ID
+//            null,    // 鐗╂枡缂栫爜
+//            null,    // 鐗╂枡鍚嶇О
+//            null,    // 閫佽揣鏁伴噺[闈炵┖]
+//            null,    // 搴撳瓨鍗曚綅
+//            null,    // 鎵ц涓暟閲廩闈炵┖]
+//            null,    // 閲囪喘鏁伴噺[闈炵┖]
+//            null,    // 閲囪喘鍗曚綅
+//            null,    // 宸叉敹鏁伴噺
+//            null,    // 渚涘簲鍟嗙紪鐮�
+//            null,    // 搴撳瓨鎵规
+//            null,    // 渚涘簲鍟嗘壒娆�
+//            null,    // 渚涘簲鍟嗗悕绉�
+//            null,    // 璺熻釜鐮�
+//            null,    // 鏉″舰鐮�
+//            null,    // 鐢熶骇鏃ユ湡
+//            null,    // 鍖呰鍚嶇О
+//            null,    // 鐘舵�乕闈炵┖]
+//            null,    // 鏄惁鍒犻櫎[闈炵┖]
+//            null,    // 绉熸埛
+//            null,    // 娣诲姞浜哄憳
+//            null,    // 娣诲姞鏃堕棿[闈炵┖]
+//            null,    // 淇敼浜哄憳
+//            null,    // 淇敼鏃堕棿[闈炵┖]
+//            null    // 澶囨敞
+//    );
+
+    public String getStatus$(){
+        if (null == this.status){ return null; }
+        switch (this.status){
+            case 1:
+                return "姝e父";
+            case 0:
+                return "鍐荤粨";
+            default:
+                return String.valueOf(this.status);
+        }
+    }
+
+    public String getCreateBy$(){
+        UserService service = SpringUtils.getBean(UserService.class);
+        User user = service.getById(this.createBy);
+        if (!Cools.isEmpty(user)){
+            return String.valueOf(user.getNickname());
+        }
+        return null;
+    }
+
+    public String getCreateTime$(){
+        if (Cools.isEmpty(this.createTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+    }
+
+    public String getUpdateBy$(){
+        UserService service = SpringUtils.getBean(UserService.class);
+        User user = service.getById(this.updateBy);
+        if (!Cools.isEmpty(user)){
+            return String.valueOf(user.getNickname());
+        }
+        return null;
+    }
+
+    public String getUpdateTime$(){
+        if (Cools.isEmpty(this.updateTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+    }
+
+
+
+    public Boolean getStatusBool(){
+        if (null == this.status){ return null; }
+        switch (this.status){
+            case 1:
+                return true;
+            case 0:
+                return false;
+            default:
+                return null;
+        }
+    }
+
+}

--
Gitblit v1.9.1