From 41411a57fc0d237577aa10ccfc1aded50556f5ba Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期六, 28 三月 2026 13:35:23 +0800
Subject: [PATCH] Revert "添加的分属环境配置文件 暂停上报功能"
---
src/main/java/com/zy/asrs/entity/OrderPakout.java | 51 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 41 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderPakout.java b/src/main/java/com/zy/asrs/entity/OrderPakout.java
index 1fbd646..ec37294 100644
--- a/src/main/java/com/zy/asrs/entity/OrderPakout.java
+++ b/src/main/java/com/zy/asrs/entity/OrderPakout.java
@@ -6,6 +6,9 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.api.enums.OrderWkType;
+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 +69,7 @@
@TableField("item_id")
private Long itemId;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "鍖哄煙ID")
@TableField("item_name")
private String itemName;
@@ -352,6 +355,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);
@@ -361,15 +381,14 @@
return null;
}
- public String getPayType$(){
- if (null == this.payType){ return null; }
- switch (this.payType){
- case 1:
- return "鐜伴噾";
- case 2:
- return "璁拌处";
- default:
- return String.valueOf(this.payType);
+ public String getShipName$(){
+ if (null == this.shipName){ return OrderWkType.ORDER_WK_ORDER_OUT_SO.desc; }
+ if (this.shipName.equals(OrderWkType.ORDER_WK_ORDER_OUT_EO.val)){
+ return OrderWkType.ORDER_WK_ORDER_OUT_EO.desc;
+ } else if (this.shipName.equals(OrderWkType.ORDER_WK_ORDER_OUT_SO.val)){
+ return OrderWkType.ORDER_WK_ORDER_OUT_SO.desc;
+ } else {
+ return OrderWkType.ORDER_WK_ORDER_OUT.desc;
}
}
@@ -408,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