From f3ce4485cd37eb7c3bcf16fde86a7f149974c4b6 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 20 三月 2026 09:51:50 +0800
Subject: [PATCH] #检查导出功能： 1.商品档案无异常 2.库存明细管理（异常）已修复 3.库存明细统计无异常 4.工作档查询维护无异常 5.工作档明细查询无异常 6.工作历史档查询无异常 7.工作明细历史档查询无异常 8.入库通知历史档无异常 9.库存移动流水记录（异常）已修复 10.机台工位绑定无异常 11.库存调整记录无异常 12.工作档维护日志（异常）已修复 13.操作日志无异常
---
src/main/java/com/zy/asrs/entity/Order.java | 123 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 123 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Order.java b/src/main/java/com/zy/asrs/entity/Order.java
index 99abc64..5e9877b 100644
--- a/src/main/java/com/zy/asrs/entity/Order.java
+++ b/src/main/java/com/zy/asrs/entity/Order.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;
@@ -261,6 +262,23 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+
+ @ApiModelProperty("涓婃姤娆℃暟")
+ private Integer reportOnce;
+ /**
+ * 鐘舵�� 1: 杩涜涓� 0: 鍒濆 2:宸插畬鎴�
+ */
+ @ApiModelProperty(value= "鐘舵�� 2:宸插畬鎴� 1: 杩涜涓� 0: 鍒濆 ")
+ @TableField("move_status")
+ private Integer moveStatus;
+
+ /**
+ * 鐘舵�� 1: 杩涜涓� 0: 鍒濆 2:宸插畬鎴�
+ */
+ @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨嬶紙0锛氭湭鐭ワ紝1锛氬叆搴擄紝2锛氬嚭搴擄級")
+ @TableField("pakin_pakout_status")
+ private Integer pakinPakoutStatus;
+
public Order() {}
public Order(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) {
@@ -298,6 +316,83 @@
this.updateBy = updateBy;
this.updateTime = updateTime;
this.memo = memo;
+ }
+
+ public Order(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,Integer pakinPakoutStatus) {
+ this.uuid = uuid;
+ this.orderNo = orderNo;
+ this.orderTime = orderTime;
+ this.docType = docType;
+ this.itemId = itemId;
+ this.itemName = itemName;
+ this.allotItemId = allotItemId;
+ this.defNumber = defNumber;
+ this.number = number;
+ this.cstmr = cstmr;
+ this.cstmrName = cstmrName;
+ this.tel = tel;
+ this.operMemb = operMemb;
+ this.totalFee = totalFee;
+ this.discount = discount;
+ this.discountFee = discountFee;
+ this.otherFee = otherFee;
+ this.actFee = actFee;
+ this.payType = payType;
+ this.salesman = salesman;
+ this.accountDay = accountDay;
+ this.postFeeType = postFeeType;
+ this.postFee = postFee;
+ this.payTime = payTime;
+ this.sendTime = sendTime;
+ this.shipName = shipName;
+ this.shipCode = shipCode;
+ this.settle = settle;
+ this.status = status;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.memo = memo;
+ this.pakinPakoutStatus = pakinPakoutStatus;
+ }
+
+ public Order(Order order) {
+ this.uuid = order.getUuid();
+ this.orderNo = order.getOrderNo();
+ this.orderTime = order.getOrderTime();
+ this.docType = order.getDocType();
+ this.itemId = order.getItemId();
+ this.itemName = order.getItemName();
+ this.allotItemId = order.getAllotItemId();
+ this.defNumber = order.getDefNumber();
+ this.number = order.getNumber();
+ this.cstmr = order.getCstmr();
+ this.cstmrName = order.getCstmrName();
+ this.tel = order.getTel();
+ this.operMemb = order.getOperMemb();
+ this.totalFee = order.getTotalFee();
+ this.discount = order.getDiscount();
+ this.discountFee = order.getDiscountFee();
+ this.otherFee = order.getOtherFee();
+ this.actFee = order.getActFee();
+ this.payType = order.getPayType();
+ this.salesman = order.getSalesman();
+ this.accountDay = order.getAccountDay();
+ this.postFeeType = order.getPostFeeType();
+ this.postFee = order.getPostFee();
+ this.payTime = order.getPayTime();
+ this.sendTime = order.getSendTime();
+ this.shipName = order.getShipName();
+ this.shipCode = order.getShipCode();
+ this.settle = order.getSettle();
+ this.status = order.getStatus();
+ this.createBy = order.getCreateBy();
+ this.createTime = order.getCreateTime();
+ this.updateBy = order.getUpdateBy();
+ this.updateTime = order.getUpdateTime();
+ this.memo = order.getMemo();
+ this.moveStatus = order.getMoveStatus();
+ this.pakinPakoutStatus = order.getPakinPakoutStatus();
}
// Order order = new Order(
@@ -358,6 +453,17 @@
}
}
+ public String getPakinPakoutStatus$(){
+ switch (this.pakinPakoutStatus){
+ case 1:
+ return "Y";
+ case 2:
+ return "N";
+ default:
+ return null;
+ }
+ }
+
public String getPostFeeType$(){
if (null == this.postFeeType){ return null; }
switch (this.postFeeType){
@@ -405,6 +511,20 @@
}
}
+ public String getMoveStatus$(){
+ if (null == this.moveStatus){ return null; }
+ switch (this.moveStatus){
+ case 2:
+ return "宸插璐�";
+ case 1:
+ return "澶囪揣涓�";
+ case 0:
+ return "鏈垵濮�";
+ default:
+ return String.valueOf(this.moveStatus);
+ }
+ }
+
public String getCreateBy$(){
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.createBy);
@@ -437,5 +557,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