From b84b7c38d8cd7bdaeb171b4c6b6ca67ba65d9f61 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 20 三月 2026 20:15:53 +0800
Subject: [PATCH] 1.修复历史档没有源站点和目标站点 2.修复库存明细搜索栏 3.修复手动入库给出库完成任务标记
---
src/main/java/com/zy/asrs/entity/OrderPakout.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderPakout.java b/src/main/java/com/zy/asrs/entity/OrderPakout.java
index e58968a..aaa08a9 100644
--- a/src/main/java/com/zy/asrs/entity/OrderPakout.java
+++ b/src/main/java/com/zy/asrs/entity/OrderPakout.java
@@ -8,6 +8,7 @@
import com.core.common.SpringUtils;
import com.zy.asrs.service.DocTypeService;
import com.zy.asrs.service.OrderSettleService;
+import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
@@ -268,6 +269,13 @@
@TableField("move_status")
private Integer moveStatus;
+ /**
+ * 鐘舵�� 1: 杩涜涓� 0: 鍒濆 2:宸插畬鎴�
+ */
+ @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨嬶紙0锛氭湭鐭ワ紝1锛氬叆搴擄紝2锛氬嚭搴擄級")
+ @TableField("pakin_pakout_status")
+ private Integer pakinPakoutStatus;
+
public OrderPakout() {}
public OrderPakout(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
@@ -400,6 +408,18 @@
return null;
}
+ public String getPakinPakoutStatus$(){
+ switch (this.pakinPakoutStatus){
+ case 1:
+ return "Y";
+ case 2:
+ return "N";
+ default:
+ return null;
+ }
+ }
+
+
public String getStatus$(){
if (null == this.status){ return null; }
switch (this.status){
@@ -458,5 +478,8 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
}
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
}
--
Gitblit v1.9.1