From f08dd93e49e8461f362c8f45f17fe10e0fbdebec Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 12 一月 2026 18:54:58 +0800
Subject: [PATCH] #新增和得码入库流程，渝程进仓后续下发货主转换
---
src/main/java/com/zy/asrs/entity/Order.java | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Order.java b/src/main/java/com/zy/asrs/entity/Order.java
index 90aac1d..e971ecf 100644
--- a/src/main/java/com/zy/asrs/entity/Order.java
+++ b/src/main/java/com/zy/asrs/entity/Order.java
@@ -66,7 +66,7 @@
@TableField("item_id")
private Long itemId;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "Po")
@TableField("item_name")
private String itemName;
@@ -315,6 +315,7 @@
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;
@@ -392,6 +393,46 @@
this.pakinPakoutStatus = order.getPakinPakoutStatus();
}
+
+ public Order(OrderPakin 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(
// null, // 缂栧彿[闈炵┖]
// null, // 璁㈠崟缂栧彿
--
Gitblit v1.9.1