From ef0cfacabe207182cca09547a775eeed8a3ecec5 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 22 一月 2026 15:10:44 +0800
Subject: [PATCH] #
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java | 401 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 309 insertions(+), 92 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java
index 6474f6e..b861d02 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java
@@ -5,7 +5,9 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.vincent.rsf.server.api.controller.erp.params.SyncOrderParams;
import com.vincent.rsf.server.manager.enums.OrderType;
+import com.vincent.rsf.server.manager.enums.OrderWorkType;
import com.vincent.rsf.server.system.constant.DictTypeCode;
import com.vincent.rsf.server.system.entity.DictData;
import com.vincent.rsf.server.system.service.DictDataService;
@@ -13,7 +15,6 @@
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
-
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -25,6 +26,7 @@
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;
@Data
@@ -37,38 +39,38 @@
/**
* ID
*/
- @ApiModelProperty(value= "ID")
+ @ApiModelProperty(value = "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 缂栧彿
*/
- @ApiModelProperty(value= "缂栧彿")
+ @ApiModelProperty(value = "缂栧彿")
private String code;
/**
* PO鍗曞彿
*/
- @ApiModelProperty(value= "PO鍗曞彿")
+ @ApiModelProperty(value = "PO鍗曞彿")
private String poCode;
/**
* PO鍗曟嵁鏍囪瘑
*/
- @ApiModelProperty(value= "PO鍗曟嵁鏍囪瘑")
+ @ApiModelProperty(value = "PO鍗曟嵁鏍囪瘑")
private Long poId;
/**
* 鍗曟嵁绫诲瀷
*/
- @ApiModelProperty(value= "鍗曟嵁绫诲瀷")
+ @ApiModelProperty(value = "鍗曟嵁绫诲瀷")
private String type;
/**
* 涓氬姟绫诲瀷
*/
- @ApiModelProperty(value= "涓氬姟绫诲瀷")
+ @ApiModelProperty(value = "涓氬姟绫诲瀷")
private String wkType;
@ApiModelProperty("鐩樼偣绫诲瀷")
@@ -77,7 +79,7 @@
/**
* 閫佽揣鏁伴噺
*/
- @ApiModelProperty(value= "閫佽揣鏁伴噺")
+ @ApiModelProperty(value = "閫佽揣鏁伴噺")
private Double anfme;
@ApiModelProperty("鎵ц鏁伴噺")
@@ -86,13 +88,13 @@
/**
* 宸叉敹鏁伴噺
*/
- @ApiModelProperty(value= "宸叉敹鏁伴噺")
+ @ApiModelProperty(value = "宸叉敹鏁伴噺")
private Double qty;
/**
* 鐗╂祦鍗曞彿
*/
- @ApiModelProperty(value= "鐗╂祦鍗曞彿")
+ @ApiModelProperty(value = "鐗╂祦鍗曞彿")
private String logisNo;
@ApiModelProperty("娉㈡ID")
@@ -101,8 +103,8 @@
/**
* 棰勮鍒拌揪鏃堕棿
*/
- @ApiModelProperty(value= "棰勮鍒拌揪鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "棰勮鍒拌揪鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date arrTime;
/**
@@ -111,72 +113,217 @@
@ApiModelProperty("涓婃姤鐘舵�� 0锛氭湭涓婃姤, 1锛氬凡涓婃姤")
private Integer ntyStatus;
- /**
- * 閲婃斁鐘舵�� 0: 姝ｅ父 1: 宸查噴鏀�
- */
- @ApiModelProperty(value= "閲婃斁鐘舵�� 0: 姝ｅ父 1: 宸查噴鏀� ")
- private Short rleStatus;
+ @ApiModelProperty("涓婃姤娆℃暟")
+ private Integer reportOnce;
+ /**
+ * 閲婃斁鐘舵�� 0: 姝ｅ父 1: 宸查噴鏀�
+ */
+ @ApiModelProperty(value = "閲婃斁鐘舵�� 0: 姝ｅ父 1: 宸查噴鏀� ")
+ private Short rleStatus;
@ApiModelProperty("鎵ц鐘舵��")
private Short exceStatus;
/**
- * 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
+ * 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
*/
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 鍐荤粨 ")
+ @ApiModelProperty(value = "鐘舵�� 1: 姝ｅ父 0: 鍐荤粨 ")
private Integer status;
/**
- * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
+ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
- @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
@TableLogic
private Integer deleted;
/**
* 绉熸埛
*/
- @ApiModelProperty(value= "绉熸埛")
+ @ApiModelProperty(value = "绉熸埛")
private Integer tenantId;
/**
* 娣诲姞浜哄憳
*/
- @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @ApiModelProperty(value = "娣诲姞浜哄憳")
private Long createBy;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
private Long updateBy;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
- public WkOrder() {}
+ /**
+ * 浠撳簱ID
+ */
+ @ApiModelProperty(value = "浠撳簱ID")
+ private Long warehouseId;
- public WkOrder(String code, String poCode, Long poId, String type, String wkType, Double anfme, Double qty, String logisNo, Date arrTime, Short rleStatus, Integer status, Integer deleted, Integer tenantId, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
+ /**
+ * 搴撳尯ID
+ */
+ @ApiModelProperty(value = "搴撳尯ID")
+ private Long wareAreaId;
+
+ /**
+ * 涓氬姟鏃堕棿
+ */
+ @ApiModelProperty(value = "涓氬姟鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date businessTime;
+
+ /**
+ * 浣滀笟鐐�
+ */
+ @ApiModelProperty(value = "浣滀笟鐐�")
+ private String stationId;
+
+ /**
+ * 璐т富id
+ */
+ @ApiModelProperty(value = "璐т富id")
+ private Long shipperId;
+
+ /**
+ * 鍗曟嵁鍐呯爜
+ */
+ @ApiModelProperty(value = "鍗曟嵁鍐呯爜")
+ private String orderInternalCode;
+
+ /**
+ * 搴撳瓨鏂瑰悜
+ */
+ @ApiModelProperty(value = "搴撳瓨鏂瑰悜")
+ private String stockDirect;
+
+ /**
+ * 瀹㈡埛缂栫爜
+ */
+ @ApiModelProperty(value = "瀹㈡埛缂栫爜")
+ private String customerId;
+
+ /**
+ * 瀹㈡埛鍚嶇О
+ */
+ @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
+ private String customerName;
+
+ /**
+ * 渚涘簲鍟嗙紪鐮�
+ */
+ @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
+ private String supplierId;
+
+ /**
+ * 渚涘簲鍟嗗悕绉�
+ */
+ @ApiModelProperty(value = "渚涘簲鍟嗗悕绉�")
+ private String supplierName;
+
+ /**
+ * 鏀舵枡/鍙戣揣缁勭粐
+ */
+ @ApiModelProperty(value = "鏀舵枡/鍙戣揣缁勭粐")
+ private String stockOrgId;
+
+ /**
+ * 鏀舵枡/鍙戣揣缁勭粐鍚嶇О
+ */
+ @ApiModelProperty(value = "鏀舵枡/鍙戣揣缁勭粐鍚嶇О")
+ private String stockOrgName;
+
+ /**
+ * 閲囪喘缁勭粐
+ */
+ @ApiModelProperty(value = "閲囪喘缁勭粐")
+ private String purchaseOrgId;
+
+ /**
+ * 閲囪喘缁勭粐鍚嶇О
+ */
+ @ApiModelProperty(value = "閲囪喘缁勭粐鍚嶇О")
+ private String purchaseOrgName;
+
+ /**
+ * 閲囪喘鍛�
+ */
+ @ApiModelProperty(value = "閲囪喘鍛�")
+ private String purchaseUserId;
+
+ /**
+ * 閲囪喘鍛樺悕绉�
+ */
+ @ApiModelProperty(value = "閲囪喘鍛樺悕绉�")
+ private String purchaseUserName;
+
+ /**
+ * 鐢熶骇缁勭粐
+ */
+ @ApiModelProperty(value = "鐢熶骇缁勭粐")
+ private String prdOrgId;
+
+ /**
+ * 鐢熶骇缁勭粐鍚嶇О
+ */
+ @ApiModelProperty(value = "鐢熶骇缁勭粐鍚嶇О")
+ private String prdOrgName;
+
+ /**
+ * 閿�鍞粍缁�
+ */
+ @ApiModelProperty(value = "閿�鍞粍缁�")
+ private String saleOrgId;
+
+ /**
+ * 閿�鍞粍缁囧悕绉�
+ */
+ @ApiModelProperty(value = "閿�鍞粍缁囧悕绉�")
+ private String saleOrgName;
+
+ /**
+ * 閿�鍞憳
+ */
+ @ApiModelProperty(value = "閿�鍞憳")
+ private String saleUserId;
+
+ /**
+ * 閿�鍞憳鍚嶇О
+ */
+ @ApiModelProperty(value = "閿�鍞憳鍚嶇О")
+ private String saleUserName;
+
+ public WkOrder() {
+ }
+
+ public WkOrder(String code, String poCode, Long poId, String type, String wkType, Double anfme, Double qty,
+ String logisNo, Date arrTime, Short rleStatus, Integer status, Integer deleted, Integer tenantId,
+ Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
this.code = code;
this.poCode = poCode;
this.poId = poId;
@@ -197,8 +344,58 @@
this.memo = memo;
}
+ public WkOrder(SyncOrderParams syncOrderParams) {
+ this.code = code;
+ this.poCode = poCode;
+ this.poId = poId;
+ this.type = type;
+ this.wkType = wkType;
+ this.checkType = checkType;
+ this.anfme = anfme;
+ this.workQty = workQty;
+ this.qty = qty;
+ this.logisNo = logisNo;
+ this.waveId = waveId;
+ this.arrTime = arrTime;
+ this.ntyStatus = ntyStatus;
+ this.reportOnce = reportOnce;
+ this.rleStatus = rleStatus;
+ this.exceStatus = exceStatus;
+ this.status = status;
+ this.deleted = deleted;
+ this.tenantId = tenantId;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.memo = memo;
+ this.warehouseId = warehouseId;
+ this.wareAreaId = wareAreaId;
+ this.businessTime = businessTime;
+ this.stationId = stationId;
+ this.shipperId = shipperId;
+ this.orderInternalCode = orderInternalCode;
+ this.stockDirect = stockDirect;
+ this.customerId = customerId;
+ this.customerName = customerName;
+ this.supplierId = supplierId;
+ this.supplierName = supplierName;
+ this.stockOrgId = stockOrgId;
+ this.stockOrgName = stockOrgName;
+ this.purchaseOrgId = purchaseOrgId;
+ this.purchaseOrgName = purchaseOrgName;
+ this.purchaseUserId = purchaseUserId;
+ this.purchaseUserName = purchaseUserName;
+ this.prdOrgId = prdOrgId;
+ this.prdOrgName = prdOrgName;
+ this.saleOrgId = saleOrgId;
+ this.saleOrgName = saleOrgName;
+ this.saleUserId = saleUserId;
+ this.saleUserName = saleUserName;
+ }
+
public String getExceStatus$() {
- if (Cools.isEmpty(this.exceStatus)){
+ if (Cools.isEmpty(this.exceStatus)) {
return "";
}
String exceType = DictTypeCode.DICT_ASN_EXCE_STATUS;
@@ -215,72 +412,89 @@
return dictData.getLabel();
}
+ public String getType$() {
+ return OrderType.getValType(this.type);
- public String getType$(){
- if (Cools.isEmpty(this.type)){
+ // if (this.type.equals(OrderType.ORDER_TRANSFER.type)) {
+ // return OrderType.getValType(this.type);
+ // } else {
+ // if (Cools.isEmpty(this.type)) {
+ // return "";
+ // }
+ // DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+ // DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
+ // .eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_ORDER_TYPE)
+ // .eq(DictData::getValue, this.type));
+ // if (Objects.isNull(dictData)) {
+ // return null;
+ // }
+ // return dictData.getLabel();
+ // }
+ }
+
+ public String getWkType$() {
+ // if (this.type.equals(OrderType.ORDER_TRANSFER.type)) {
+ return OrderWorkType.getWorkDesc(this.wkType);
+ // } else {
+ // String typeCode = DictTypeCode.DICT_SYS_BUSINESS_TYPE;
+ // if (type.equals(OrderType.ORDER_CHECK.type)) {
+ // typeCode = DictTypeCode.SYS_CHECK_ORDER_TYPE;
+ // }
+ // if (Cools.isEmpty(this.wkType)) {
+ // return "";
+ // }
+ // DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+ // DictData dictData = dictDataService
+ // .getOne(new LambdaQueryWrapper<DictData>()
+ // .eq(DictData::getDictTypeCode, typeCode)
+ // .eq(DictData::getValue, this.wkType));
+ // if (Objects.isNull(dictData)) {
+ // return null;
+ // }
+ // return dictData.getLabel();
+ // }
+ }
+
+ public String getCheckType$() {
+ if (Cools.isEmpty(this.checkType)) {
return "";
}
DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
- .eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_ORDER_TYPE)
- .eq(DictData::getValue, this.type));
+ .eq(DictData::getDictTypeCode, DictTypeCode.SYS_CHECK_TYPE)
+ .eq(DictData::getValue, this.checkType));
if (Objects.isNull(dictData)) {
return null;
}
return dictData.getLabel();
}
- public String getWkType$(){
- String typeCode = DictTypeCode.DICT_SYS_BUSINESS_TYPE;
- if (type.equals(OrderType.ORDER_CHECK.type)) {
- typeCode = DictTypeCode.SYS_CHECK_ORDER_TYPE;
- }
- if (Cools.isEmpty(this.wkType)){
- return "";
- }
- DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
- DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, typeCode).eq(DictData::getValue, this.wkType));
- if (Objects.isNull(dictData)) {
- return null;
- }
- return dictData.getLabel();
- }
-
- public String getCheckType$(){
- if (Cools.isEmpty(this.checkType)){
- return "";
- }
- DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
- DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, DictTypeCode.SYS_CHECK_TYPE).eq(DictData::getValue, this.checkType));
- if (Objects.isNull(dictData)) {
- return null;
- }
- return dictData.getLabel();
- }
-
-
- public String getArrTime$(){
- if (Cools.isEmpty(this.arrTime)){
+ public String getArrTime$() {
+ if (Cools.isEmpty(this.arrTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.arrTime);
}
- public String getRleStatus$(){
- if (null == this.rleStatus){ return null; }
- switch (this.rleStatus){
+ public String getRleStatus$() {
+ if (null == this.rleStatus) {
+ return null;
+ }
+ switch (this.rleStatus) {
case 0:
return " 姝ｅ父";
- case 1:
+ case 1:
return " 宸查噴鏀�";
default:
return String.valueOf(this.rleStatus);
}
}
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "姝ｅ父";
case 0:
@@ -290,43 +504,43 @@
}
}
- public String getCreateBy$(){
+ public String getCreateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.getById(this.createBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getNickname());
}
return null;
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public String getUpdateBy$(){
+ public String getUpdateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.getById(this.updateBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getNickname());
}
return null;
}
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
+ 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){
+ public Boolean getStatusBool() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return true;
case 0:
@@ -335,9 +549,12 @@
return null;
}
}
- public String getNtyStatus$(){
- if (null == this.ntyStatus){ return "error"; }
- switch (this.ntyStatus){
+
+ public String getNtyStatus$() {
+ if (null == this.ntyStatus) {
+ return "error";
+ }
+ switch (this.ntyStatus) {
case 0:
return "鏈笂鎶�";
case 1:
--
Gitblit v1.9.1