From e8855038f6e47cde0d6a8a9ddb2fa5a629e0efbb Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期四, 22 一月 2026 13:39:56 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrder.java | 279 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 235 insertions(+), 44 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 968131f..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,6 +5,7 @@
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;
@@ -14,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;
@@ -113,24 +113,26 @@
@ApiModelProperty("涓婃姤鐘舵�� 0锛氭湭涓婃姤, 1锛氬凡涓婃姤")
private Integer ntyStatus;
+ @ApiModelProperty("涓婃姤娆℃暟")
+ private Integer reportOnce;
+
/**
- * 閲婃斁鐘舵�� 0: 姝ｅ父 1: 宸查噴鏀�
+ * 閲婃斁鐘舵�� 0: 姝ｅ父 1: 宸查噴鏀�
*/
@ApiModelProperty(value = "閲婃斁鐘舵�� 0: 姝ｅ父 1: 宸查噴鏀� ")
private Short rleStatus;
-
@ApiModelProperty("鎵ц鐘舵��")
private Short exceStatus;
/**
- * 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
+ * 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
*/
@ApiModelProperty(value = "鐘舵�� 1: 姝ｅ父 0: 鍐荤粨 ")
private Integer status;
/**
- * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
+ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value = "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
@TableLogic
@@ -176,10 +178,152 @@
@ApiModelProperty(value = "澶囨敞")
private String memo;
+ /**
+ * 浠撳簱ID
+ */
+ @ApiModelProperty(value = "浠撳簱ID")
+ private Long warehouseId;
+
+ /**
+ * 搴撳尯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) {
+ 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;
@@ -200,6 +344,56 @@
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)) {
return "";
@@ -218,48 +412,47 @@
return dictData.getLabel();
}
-
public String getType$() {
return OrderType.getValType(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();
-// }
+ // 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();
-// }
+ // 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$() {
@@ -275,7 +468,6 @@
}
return dictData.getLabel();
}
-
public String getArrTime$() {
if (Cools.isEmpty(this.arrTime)) {
@@ -343,7 +535,6 @@
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
}
-
public Boolean getStatusBool() {
if (null == this.status) {
--
Gitblit v1.9.1