From 0696db2f8a83d32d8c00ba55967694ed1a76f4d0 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 05 五月 2025 16:07:35 +0800
Subject: [PATCH] 1. 往来企业问题修复 2. 组托问题修复 3. 库位信息问题修复

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Purchase.java |   44 ++++++++++++++++++++++++++++++++++++--------
 1 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Purchase.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Purchase.java
index 2f55f31..5bf17f1 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Purchase.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Purchase.java
@@ -1,7 +1,14 @@
 package com.vincent.rsf.server.manager.entity;
 
 import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.util.*;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.vincent.rsf.server.system.constant.DictTypeCode;
+import com.vincent.rsf.server.system.entity.DictData;
+import com.vincent.rsf.server.system.service.DictDataService;
+import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -28,6 +35,7 @@
 import java.util.Date;
 
 @Data
+@Accessors(chain = true)
 @TableName("man_purchase")
 public class Purchase implements Serializable {
 
@@ -52,11 +60,15 @@
     @ApiModelProperty(value= "鍗曟嵁绫诲瀷")
     private String type;
 
+
+    @ApiModelProperty(value = "erp涓诲崟鏍囪瘑")
+    private String platId;
+
     /**
      * 鍗曟嵁鏉ユ簮
      */
     @ApiModelProperty(value= "鍗曟嵁鏉ユ簮")
-    private String from;
+    private String source;
 
     /**
      * 棰勮鍒拌揪鏃堕棿
@@ -80,7 +92,7 @@
     /**
      * 宸叉敹璐ф暟閲�
      */
-    @ApiModelProperty(value= "宸叉敹璐ф暟閲�")
+    @ApiModelProperty(value= "鏀惰揣涓暟閲�")
     private Double workQty;
 
     /**
@@ -93,7 +105,7 @@
      * erp鍗曞彿
      */
     @ApiModelProperty(value= "erp鍗曞彿")
-    private String erpCode;
+    private String platCode;
 
     /**
      * 璁″垝鏀惰揣鏃堕棿
@@ -125,7 +137,6 @@
      * 鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  
      */
     @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  ")
-    @TableLogic
     private Integer deleted;
 
     /**
@@ -145,6 +156,7 @@
      */
     @ApiModelProperty(value= "娣诲姞鏃堕棿")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date createTime;
 
     /**
@@ -158,6 +170,7 @@
      */
     @ApiModelProperty(value= "淇敼鏃堕棿")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date updateTime;
 
     /**
@@ -168,16 +181,17 @@
 
     public Purchase() {}
 
-    public Purchase(String code,String type,String from,Date preArr,Double anfme,Double qty,Double workQty,String channel,String erpCode,Date startTime,Date endTime,String project,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+    public Purchase(String code,String type,String source,String platId ,Date preArr,Double anfme,Double qty,Double workQty,String channel,String platCode,Date startTime,Date endTime,String project,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
         this.code = code;
         this.type = type;
-        this.from = from;
+        this.source = source;
+        this.platId = platId;
         this.preArr = preArr;
         this.anfme = anfme;
         this.qty = qty;
         this.workQty = workQty;
         this.channel = channel;
-        this.erpCode = erpCode;
+        this.platCode = platCode;
         this.startTime = startTime;
         this.endTime = endTime;
         this.project = project;
@@ -214,6 +228,20 @@
 //            null    // 澶囨敞
 //    );
 
+    public String getType$() {
+        if (Cools.isEmpty(this.type)) {
+            return "";
+        }
+        DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+        DictData dictDatas = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
+                .eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_ORDER_TYPE)
+                .eq(DictData::getValue, this.type));
+        if (Objects.isNull(dictDatas) || Objects.isNull(dictDatas.getLabel())) {
+            return null;
+        }
+        return dictDatas.getLabel();
+    }
+
     public String getPreArr$(){
         if (Cools.isEmpty(this.preArr)){
             return "";

--
Gitblit v1.9.1