From 4693c6fa42d2cb72594b6b58e9fab9e0d4c224aa Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期一, 08 十二月 2025 15:58:43 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/entity/OrderPakout.java | 40 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 39 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderPakout.java b/src/main/java/com/zy/asrs/entity/OrderPakout.java
index 2ffa057..bab33e7 100644
--- a/src/main/java/com/zy/asrs/entity/OrderPakout.java
+++ b/src/main/java/com/zy/asrs/entity/OrderPakout.java
@@ -6,6 +6,8 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.asrs.entity.BasAreas;
+import com.zy.asrs.service.BasAreasService;
import com.zy.asrs.service.DocTypeService;
import com.zy.asrs.service.OrderSettleService;
import com.zy.common.utils.Synchro;
@@ -66,7 +68,7 @@
@TableField("item_id")
private Long itemId;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "鍖哄煙ID")
@TableField("item_name")
private String itemName;
@@ -269,6 +271,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) {
@@ -345,6 +354,23 @@
// null // 澶囨敞
// );
+
+ public String getItemName$() {
+ if (Cools.isEmpty(this.itemName)) {
+ return null;
+ }
+ try {
+ BasAreasService service = SpringUtils.getBean(BasAreasService.class);
+ BasAreas area = service.selectById(Long.parseLong(this.itemName));
+ if (!Cools.isEmpty(area)) {
+ return area.getName();
+ }
+ } catch (Exception e) {
+ return this.itemName;
+ }
+ return null;
+ }
+
public String getDocType$(){
DocTypeService service = SpringUtils.getBean(DocTypeService.class);
DocType docType = service.selectById(this.docType);
@@ -401,6 +427,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){
--
Gitblit v1.9.1