From 16f8d56d61ce93930f9f29e8fbd465de5af90370 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 29 四月 2025 09:12:25 +0800
Subject: [PATCH] #wms端生成任务优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Purchase.java | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 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 b59e788..ec26c9b 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,8 +1,12 @@
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.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;
@@ -55,11 +59,15 @@
@ApiModelProperty(value= "鍗曟嵁绫诲瀷")
private String type;
+
+ @ApiModelProperty(value = "erp涓诲崟鏍囪瘑")
+ private String platId;
+
/**
* 鍗曟嵁鏉ユ簮
*/
@ApiModelProperty(value= "鍗曟嵁鏉ユ簮")
- private String from;
+ private String source;
/**
* 棰勮鍒拌揪鏃堕棿
@@ -96,7 +104,7 @@
* erp鍗曞彿
*/
@ApiModelProperty(value= "erp鍗曞彿")
- private String erpCode;
+ private String platCode;
/**
* 璁″垝鏀惰揣鏃堕棿
@@ -171,16 +179,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;
@@ -217,6 +226,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