From 12067f657bc3dc169a7a466e433374368e8daf73 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期日, 18 一月 2026 16:14:27 +0800
Subject: [PATCH] 越库订单逻辑调整
---
src/main/java/com/zy/asrs/entity/OrderPakinLog.java | 43 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderPakinLog.java b/src/main/java/com/zy/asrs/entity/OrderPakinLog.java
index 13b3341..19a9b1f 100644
--- a/src/main/java/com/zy/asrs/entity/OrderPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/OrderPakinLog.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.properties.CrossDockProperties;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
@@ -20,7 +21,7 @@
import java.util.Date;
@Data
-@TableName("man_order_pakin_log")
+@TableName("man_order_log_pakin")
public class OrderPakinLog implements Serializable {
private static final long serialVersionUID = 1L;
@@ -29,7 +30,7 @@
* ID
*/
@ApiModelProperty(value = "ID")
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "id", type = IdType.INPUT)
private Long id;
/**
@@ -290,6 +291,13 @@
@TableField("monthly_settle_no")
private String monthlySettleNo;
+ /**
+ * 鏄惁鏈変笟鍔℃椂闂村彉鏇磋褰曪紙涓存椂瀛楁锛屼笉鏄犲皠鍒版暟鎹簱锛�
+ */
+ @ApiModelProperty(value = "鏄惁鏈変笟鍔℃椂闂村彉鏇磋褰�")
+ @TableField(exist = false)
+ private Boolean hasChangeLog;
+
public OrderPakinLog() {
}
@@ -371,11 +379,40 @@
DocTypeService service = SpringUtils.getBean(DocTypeService.class);
DocType docType = service.selectById(this.docType);
if (!Cools.isEmpty(docType)) {
- return String.valueOf(docType.getDocName());
+ String docName = String.valueOf(docType.getDocName());
+ // 濡傛灉鏄秺搴撳崟鎹紝娣诲姞"瓒婂簱"鏍囪瘑
+ if (isCrossDock()) {
+ return docName + "(瓒婂簱)";
+ }
+ return docName;
}
return null;
}
+ /**
+ * 鍒ゆ柇鏄惁涓鸿秺搴撳崟鎹�
+ * 閫氳繃澶囨敞瀛楁鍒ゆ柇锛堝娉ㄤ腑鍖呭惈"瓒婂簱"锛夋垨閫氳繃璁㈠崟缂栧彿鍒ゆ柇锛堝叧鑱旂殑瓒婂簱鍑哄簱鍗曪級
+ *
+ * @return true: 瓒婂簱鍗曟嵁, false: 鏅�氬崟鎹�
+ */
+ public boolean isCrossDock() {
+ // 鍒ゆ柇澶囨敞涓槸鍚﹀寘鍚�"瓒婂簱"
+ if (!Cools.isEmpty(this.memo) && this.memo.contains("瓒婂簱")) {
+ return true;
+ }
+ // 鍒ゆ柇鏄惁涓鸿秺搴撳叆搴撳崟绫诲瀷锛堣櫧鐒剁幇鍦ㄦ墍鏈夎鍗曠被鍨嬮兘鍙互鏄秺搴擄紝浣嗗巻鍙叉暟鎹彲鑳借繕鏄�氳繃绫诲瀷鍒ゆ柇锛�
+ try {
+ CrossDockProperties crossDockProperties = SpringUtils.getBean(CrossDockProperties.class);
+ if (crossDockProperties != null && this.docType != null
+ && this.docType.equals(crossDockProperties.getInboundDocTypeId())) {
+ return true;
+ }
+ } catch (Exception e) {
+ // 濡傛灉鑾峰彇閰嶇疆澶辫触锛屽拷鐣ュ紓甯�
+ }
+ return false;
+ }
+
public String getPayType$() {
if (null == this.payType) {
return null;
--
Gitblit v1.9.1