From 9f05696822f8feee385a34a92dd9aa16009e84a0 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 18 六月 2023 12:38:00 +0800
Subject: [PATCH] 寻路算法,地图节点优化,剔除原入出库模式获取地图节点方案,改为根据库位状态实时获取节点信息或直接获取无过滤的完整节点信息

---
 src/main/java/com/zy/common/model/MatDto.java |   41 +++++++++++++++++++++++++++++++++++++++--
 1 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/common/model/MatDto.java b/src/main/java/com/zy/common/model/MatDto.java
index e5b625b..358e924 100644
--- a/src/main/java/com/zy/common/model/MatDto.java
+++ b/src/main/java/com/zy/common/model/MatDto.java
@@ -1,5 +1,6 @@
 package com.zy.common.model;
 
+import com.zy.asrs.entity.OrderDetl;
 import lombok.Data;
 
 /**
@@ -9,20 +10,56 @@
 public class MatDto {
 
     // 鐗╂枡缂栧彿
-    private String matNo;
+    private String matnr;
 
     // 鐗╂枡鍚嶇О
     private String maknx;
 
+    // 搴撲綅瑙勬牸
+    private String specs;
+
     // 鐗╂枡鏁伴噺
     private Double count;
+
+    // 搴撲綅鏁伴噺
+    private Double total;
+
+    // 鐗╂枡鍚嶇О
+    private String model;
+
+    // 鏉$爜
+    private String batch;
+
+    // 璁㈠崟缂栧彿
+    private String orderNo;
 
     public MatDto() {
     }
 
+    public MatDto(OrderDetl orderDetl) {
+        this.matnr = orderDetl.getMatnr();
+        this.model = orderDetl.getModel();
+        this.batch = orderDetl.getBatch();
+        this.orderNo = orderDetl.getOrderNo();
+        this.count = orderDetl.getQty();
+        this.total = orderDetl.getAnfme();
+    }
     public MatDto(String matNo, String maknx, Double count) {
-        this.matNo = matNo;
+        this.matnr = matNo;
         this.maknx = maknx;
         this.count = count;
     }
+    public MatDto(String matNo, String maknx, Double count,String specs) {
+        this.specs = specs;
+        this.matnr = matNo;
+        this.maknx = maknx;
+        this.count = count;
+    }
+    public MatDto(String matNo, String maknx, Double count,Double total,String specs) {
+        this.specs = specs;
+        this.matnr = matNo;
+        this.maknx = maknx;
+        this.count = count;
+        this.total = total;
+    }
 }

--
Gitblit v1.9.1