From 608fb6f9529ce51291ef682638a5efc7dd51ac63 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 18 十一月 2025 08:21:08 +0800
Subject: [PATCH] 1.完善找库位 2.新增erp订单删除后,wms订单跟着删除功能 3.新增订单完成后,上报erp,erp报错后显现在出货单中 4.新增一键查询到异常完成订单 5.对销售单据和其他单据进行区分出库 6.对中间表订单状态进行完善 7.新增锁单功能 8.新增任务查询维护加上订单号

---
 src/main/java/com/zy/asrs/entity/OrderDetl.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index f0e9733..aca72cb 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -166,9 +166,9 @@
     private String manuDate;
 
     /**
-     * 鍝侀」鏁�
+     * 浠撳簱
      */
-    @ApiModelProperty(value= "鍝侀」鏁�")
+    @ApiModelProperty(value= "浠撳簱")
     @TableField("item_num")
     private String itemNum;
 
@@ -367,6 +367,9 @@
     public String getDanger$(){
         DocTypeService service = SpringUtils.getBean(DocTypeService.class);
         OrderService orderServicer=SpringUtils.getBean(OrderService.class);
+        if(Cools.isEmpty(this.orderNo)){
+            return null;
+        }
         Order order = orderServicer.selectByNo(this.orderNo);
         DocType docType = service.selectById(order.getDocType());
         if (!Cools.isEmpty(docType)){

--
Gitblit v1.9.1