From c635d78b479510ebe2556a420948effcd30a0731 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 21 十二月 2024 18:40:43 +0800
Subject: [PATCH] 新建德森项目分支

---
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetlLog.java |  660 ++++++++++++++++++++++++++++++------------------------------
 1 files changed, 330 insertions(+), 330 deletions(-)

diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetlLog.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetlLog.java
index 54e4480..4de06b3 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetlLog.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetlLog.java
@@ -1,330 +1,330 @@
-package com.zy.asrs.wms.asrs.entity;
-
-import com.baomidou.mybatisplus.annotation.TableLogic;
-
-import java.lang.reflect.Field;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.zy.asrs.common.utils.Synchro;
-import com.zy.asrs.wms.asrs.service.MatService;
-import com.zy.asrs.wms.asrs.service.OrderLogService;
-import com.zy.asrs.wms.system.entity.Host;
-import com.zy.asrs.wms.system.entity.User;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.SpringUtils;
-import com.zy.asrs.wms.system.service.UserService;
-import com.zy.asrs.wms.system.service.HostService;
-
-import java.io.Serializable;
-
-@Data
-@TableName("man_order_detl_log")
-public class OrderDetlLog 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 orderNo;
-
-    /**
-     * 鏁伴噺
-     */
-    @ApiModelProperty(value= "鏁伴噺")
-    private Double anfme;
-
-    /**
-     * 宸插畬鎴愭暟閲�
-     */
-    @ApiModelProperty(value= "宸插畬鎴愭暟閲�")
-    private Double qty;
-
-    /**
-     * 浣滀笟涓暟閲�
-     */
-    @ApiModelProperty(value= "浣滀笟涓暟閲�")
-    private Double workQty;
-
-    /**
-     * 鐗╂枡
-     */
-    @ApiModelProperty(value= "鐗╂枡")
-    private Long matId;
-
-    /**
-     * 鎵瑰彿
-     */
-    @ApiModelProperty(value= "鎵瑰彿")
-    private String batch;
-
-    /**
-     * 鎵�灞炴満鏋�
-     */
-    @ApiModelProperty(value= "鎵�灞炴満鏋�")
-    private Long hostId;
-
-    /**
-     * 鐘舵�� 1: 姝e父  0: 绂佺敤  
-     */
-    @ApiModelProperty(value= "鐘舵�� 1: 姝e父  0: 绂佺敤  ")
-    private Integer status;
-
-    /**
-     * 鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  
-     */
-    @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  ")
-    @TableLogic
-    private Integer deleted;
-
-    /**
-     * 娣诲姞鏃堕棿
-     */
-    @ApiModelProperty(value= "娣诲姞鏃堕棿")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    /**
-     * 娣诲姞浜哄憳
-     */
-    @ApiModelProperty(value= "娣诲姞浜哄憳")
-    private Long createBy;
-
-    /**
-     * 淇敼鏃堕棿
-     */
-    @ApiModelProperty(value= "淇敼鏃堕棿")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-
-    /**
-     * 淇敼浜哄憳
-     */
-    @ApiModelProperty(value= "淇敼浜哄憳")
-    private Long updateBy;
-
-    /**
-     * 澶囨敞
-     */
-    @ApiModelProperty(value= "澶囨敞")
-    private String memo;
-
-    /**
-     * 鍟嗗搧搴撳瓨绱㈠紩
-     */
-    @ApiModelProperty(value= "鍟嗗搧搴撳瓨绱㈠紩")
-    private String stockIndex;
-
-    public OrderDetlLog() {}
-
-    public OrderDetlLog(Long orderId,String orderNo,Double anfme,Double qty,Double workQty,Long matId,String batch,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
-        this.orderId = orderId;
-        this.orderNo = orderNo;
-        this.anfme = anfme;
-        this.qty = qty;
-        this.workQty = workQty;
-        this.matId = matId;
-        this.batch = batch;
-        this.hostId = hostId;
-        this.status = status;
-        this.deleted = deleted;
-        this.createTime = createTime;
-        this.createBy = createBy;
-        this.updateTime = updateTime;
-        this.updateBy = updateBy;
-        this.memo = memo;
-    }
-
-//    OrderDetlLog orderDetlLog = new OrderDetlLog(
-//            null,    // 璁㈠崟ID
-//            null,    // 璁㈠崟缂栧彿
-//            null,    // 鏁伴噺
-//            null,    // 宸插畬鎴愭暟閲�
-//            null,    // 浣滀笟涓暟閲�
-//            null,    // 鐗╂枡
-//            null,    // 鎵瑰彿
-//            null,    // 鎵�灞炴満鏋�
-//            null,    // 鐘舵��
-//            null,    // 鏄惁鍒犻櫎
-//            null,    // 娣诲姞鏃堕棿
-//            null,    // 娣诲姞浜哄憳
-//            null,    // 淇敼鏃堕棿
-//            null,    // 淇敼浜哄憳
-//            null    // 澶囨敞
-//    );
-
-    public String getOrderId$(){
-        OrderLogService service = SpringUtils.getBean(OrderLogService.class);
-        OrderLog orderLog = service.getById(this.orderId);
-        if (!Cools.isEmpty(orderLog)){
-            return String.valueOf(orderLog.getId());
-        }
-        return null;
-    }
-
-    public String getMatId$(){
-        MatService service = SpringUtils.getBean(MatService.class);
-        Mat mat = service.getById(this.matId);
-        if (!Cools.isEmpty(mat)){
-            return String.valueOf(mat.getId());
-        }
-        return null;
-    }
-
-    public Mat getMat$(){
-        MatService service = SpringUtils.getBean(MatService.class);
-        Mat mat = service.getById(this.matId);
-        if (!Cools.isEmpty(mat)){
-            return mat;
-        }
-        return null;
-    }
-
-    public String getHostId$(){
-        HostService service = SpringUtils.getBean(HostService.class);
-        Host host = service.getById(this.hostId);
-        if (!Cools.isEmpty(host)){
-            return String.valueOf(host.getName());
-        }
-        return 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 getDeleted$(){
-        if (null == this.deleted){ return null; }
-        switch (this.deleted){
-            case 1:
-                return "鏄�";
-            case 0:
-                return "鍚�";
-            default:
-                return String.valueOf(this.deleted);
-        }
-    }
-
-    public String getCreateTime$(){
-        if (Cools.isEmpty(this.createTime)){
-            return "";
-        }
-        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
-    }
-
-    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 getUpdateTime$(){
-        if (Cools.isEmpty(this.updateTime)){
-            return "";
-        }
-        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
-    }
-
-    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 void sync(Object source) {
-        Synchro.Copy(source, this);
-    }
-
-    //鍔ㄦ�佹墿灞曞瓧娈�
-    public transient Map<String, Object> dynamicFields = new HashMap<>();
-
-    @JsonAnyGetter
-    public Map<String,Object> getDynamicFields() {
-        return dynamicFields;
-    }
-
-    public void syncField(List<OrderDetlFieldLog> list) {
-        ArrayList<String> keys = new ArrayList<>();
-        Field[] fields = this.getClass().getFields();
-        for (Field field : fields) {
-            keys.add(field.getName());
-        }
-
-        Map<String, Object> dynamicFields = new HashMap<>();
-        for (OrderDetlFieldLog orderDetlFieldLog : list) {
-            if (keys.contains(orderDetlFieldLog.getName())) {
-                continue;
-            }
-            dynamicFields.put(orderDetlFieldLog.getName(), orderDetlFieldLog.getValue());
-        }
-
-        this.dynamicFields = dynamicFields;
-    }
-
-    public void syncFieldMap(Map<String, Object> map) {
-        ArrayList<String> keys = new ArrayList<>();
-        Field[] fields = this.getClass().getDeclaredFields();
-        for (Field field : fields) {
-            keys.add(field.getName());
-        }
-        keys.add("detlId");
-
-        Map<String, Object> dynamicFields = new HashMap<>();
-        for (Map.Entry<String, Object> entry : map.entrySet()) {
-            if (keys.contains(entry.getKey())) {
-                continue;
-            }
-            dynamicFields.put(entry.getKey(), entry.getValue());
-        }
-
-        this.dynamicFields = dynamicFields;
-    }
-
-    public String getFieldString(String key) {
-        return dynamicFields.get(key).toString();
-    }
-
-    public void setField(String key, Object value) {
-        dynamicFields.put(key, value);
-    }
-
-
-}
+package com.zy.asrs.wms.asrs.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+
+import java.lang.reflect.Field;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.zy.asrs.common.utils.Synchro;
+import com.zy.asrs.wms.asrs.service.MatService;
+import com.zy.asrs.wms.asrs.service.OrderLogService;
+import com.zy.asrs.wms.system.entity.Host;
+import com.zy.asrs.wms.system.entity.User;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.SpringUtils;
+import com.zy.asrs.wms.system.service.UserService;
+import com.zy.asrs.wms.system.service.HostService;
+
+import java.io.Serializable;
+
+@Data
+@TableName("man_order_detl_log")
+public class OrderDetlLog 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 orderNo;
+
+    /**
+     * 鏁伴噺
+     */
+    @ApiModelProperty(value= "鏁伴噺")
+    private Double anfme;
+
+    /**
+     * 宸插畬鎴愭暟閲�
+     */
+    @ApiModelProperty(value= "宸插畬鎴愭暟閲�")
+    private Double qty;
+
+    /**
+     * 浣滀笟涓暟閲�
+     */
+    @ApiModelProperty(value= "浣滀笟涓暟閲�")
+    private Double workQty;
+
+    /**
+     * 鐗╂枡
+     */
+    @ApiModelProperty(value= "鐗╂枡")
+    private Long matId;
+
+    /**
+     * 鎵瑰彿
+     */
+    @ApiModelProperty(value= "鎵瑰彿")
+    private String batch;
+
+    /**
+     * 鎵�灞炴満鏋�
+     */
+    @ApiModelProperty(value= "鎵�灞炴満鏋�")
+    private Long hostId;
+
+    /**
+     * 鐘舵�� 1: 姝e父  0: 绂佺敤  
+     */
+    @ApiModelProperty(value= "鐘舵�� 1: 姝e父  0: 绂佺敤  ")
+    private Integer status;
+
+    /**
+     * 鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  
+     */
+    @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  ")
+    @TableLogic
+    private Integer deleted;
+
+    /**
+     * 娣诲姞鏃堕棿
+     */
+    @ApiModelProperty(value= "娣诲姞鏃堕棿")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /**
+     * 娣诲姞浜哄憳
+     */
+    @ApiModelProperty(value= "娣诲姞浜哄憳")
+    private Long createBy;
+
+    /**
+     * 淇敼鏃堕棿
+     */
+    @ApiModelProperty(value= "淇敼鏃堕棿")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /**
+     * 淇敼浜哄憳
+     */
+    @ApiModelProperty(value= "淇敼浜哄憳")
+    private Long updateBy;
+
+    /**
+     * 澶囨敞
+     */
+    @ApiModelProperty(value= "澶囨敞")
+    private String memo;
+
+    /**
+     * 鍟嗗搧搴撳瓨绱㈠紩
+     */
+    @ApiModelProperty(value= "鍟嗗搧搴撳瓨绱㈠紩")
+    private String stockIndex;
+
+    public OrderDetlLog() {}
+
+    public OrderDetlLog(Long orderId,String orderNo,Double anfme,Double qty,Double workQty,Long matId,String batch,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
+        this.orderId = orderId;
+        this.orderNo = orderNo;
+        this.anfme = anfme;
+        this.qty = qty;
+        this.workQty = workQty;
+        this.matId = matId;
+        this.batch = batch;
+        this.hostId = hostId;
+        this.status = status;
+        this.deleted = deleted;
+        this.createTime = createTime;
+        this.createBy = createBy;
+        this.updateTime = updateTime;
+        this.updateBy = updateBy;
+        this.memo = memo;
+    }
+
+//    OrderDetlLog orderDetlLog = new OrderDetlLog(
+//            null,    // 璁㈠崟ID
+//            null,    // 璁㈠崟缂栧彿
+//            null,    // 鏁伴噺
+//            null,    // 宸插畬鎴愭暟閲�
+//            null,    // 浣滀笟涓暟閲�
+//            null,    // 鐗╂枡
+//            null,    // 鎵瑰彿
+//            null,    // 鎵�灞炴満鏋�
+//            null,    // 鐘舵��
+//            null,    // 鏄惁鍒犻櫎
+//            null,    // 娣诲姞鏃堕棿
+//            null,    // 娣诲姞浜哄憳
+//            null,    // 淇敼鏃堕棿
+//            null,    // 淇敼浜哄憳
+//            null    // 澶囨敞
+//    );
+
+    public String getOrderId$(){
+        OrderLogService service = SpringUtils.getBean(OrderLogService.class);
+        OrderLog orderLog = service.getById(this.orderId);
+        if (!Cools.isEmpty(orderLog)){
+            return String.valueOf(orderLog.getId());
+        }
+        return null;
+    }
+
+    public String getMatId$(){
+        MatService service = SpringUtils.getBean(MatService.class);
+        Mat mat = service.getById(this.matId);
+        if (!Cools.isEmpty(mat)){
+            return String.valueOf(mat.getId());
+        }
+        return null;
+    }
+
+    public Mat getMat$(){
+        MatService service = SpringUtils.getBean(MatService.class);
+        Mat mat = service.getById(this.matId);
+        if (!Cools.isEmpty(mat)){
+            return mat;
+        }
+        return null;
+    }
+
+    public String getHostId$(){
+        HostService service = SpringUtils.getBean(HostService.class);
+        Host host = service.getById(this.hostId);
+        if (!Cools.isEmpty(host)){
+            return String.valueOf(host.getName());
+        }
+        return 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 getDeleted$(){
+        if (null == this.deleted){ return null; }
+        switch (this.deleted){
+            case 1:
+                return "鏄�";
+            case 0:
+                return "鍚�";
+            default:
+                return String.valueOf(this.deleted);
+        }
+    }
+
+    public String getCreateTime$(){
+        if (Cools.isEmpty(this.createTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+    }
+
+    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 getUpdateTime$(){
+        if (Cools.isEmpty(this.updateTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+    }
+
+    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 void sync(Object source) {
+        Synchro.Copy(source, this);
+    }
+
+    //鍔ㄦ�佹墿灞曞瓧娈�
+    public transient Map<String, Object> dynamicFields = new HashMap<>();
+
+    @JsonAnyGetter
+    public Map<String,Object> getDynamicFields() {
+        return dynamicFields;
+    }
+
+    public void syncField(List<OrderDetlFieldLog> list) {
+        ArrayList<String> keys = new ArrayList<>();
+        Field[] fields = this.getClass().getFields();
+        for (Field field : fields) {
+            keys.add(field.getName());
+        }
+
+        Map<String, Object> dynamicFields = new HashMap<>();
+        for (OrderDetlFieldLog orderDetlFieldLog : list) {
+            if (keys.contains(orderDetlFieldLog.getName())) {
+                continue;
+            }
+            dynamicFields.put(orderDetlFieldLog.getName(), orderDetlFieldLog.getValue());
+        }
+
+        this.dynamicFields = dynamicFields;
+    }
+
+    public void syncFieldMap(Map<String, Object> map) {
+        ArrayList<String> keys = new ArrayList<>();
+        Field[] fields = this.getClass().getDeclaredFields();
+        for (Field field : fields) {
+            keys.add(field.getName());
+        }
+        keys.add("detlId");
+
+        Map<String, Object> dynamicFields = new HashMap<>();
+        for (Map.Entry<String, Object> entry : map.entrySet()) {
+            if (keys.contains(entry.getKey())) {
+                continue;
+            }
+            dynamicFields.put(entry.getKey(), entry.getValue());
+        }
+
+        this.dynamicFields = dynamicFields;
+    }
+
+    public String getFieldString(String key) {
+        return dynamicFields.get(key).toString();
+    }
+
+    public void setField(String key, Object value) {
+        dynamicFields.put(key, value);
+    }
+
+
+}

--
Gitblit v1.9.1