From fae739affd1b7aa0efb6f582c4e09e7030784857 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期四, 04 九月 2025 08:20:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jx-fyxc-wms' into jx-fyxc-wms

---
 src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java |   31 ++++++++++++++-----------------
 1 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
index 96cad9c..ea29de5 100644
--- a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
@@ -15,26 +15,23 @@
 @Data
 public class OpenOrderPakoutParam {
 
-    private String orderNo;
+    private String orderType; //鍗曟嵁鍚嶇О
+    private String inboundDate; //鏃ユ湡
+    private String orderNo; // 鍗曟嵁鍙�
+    private String warehouse; //浠撳簱
+    private String originWarehouse; //鏉ユ簮浠撳簱
+    private String suppliers; // 渚涘簲鍟�
+    private String salesman; //涓氬姟鍛�
+    private String department; //閮ㄩ棬
+    private String businessType; //涓氬姟绫诲瀷
+    private String user; //鍒跺崟浜�
+    private String quality;
+    private String fromOrderNo; //鏉ユ簮鍗曞彿
 
-    private String orderType;
-
-    private String orderTime;
-
-    private List<DetlDto> orderDetails;
+    private List<DetlDto> details;
 
     private String lgort;
 
-    public static void main(String[] args) {
-        OpenOrderPakoutParam param = new OpenOrderPakoutParam();
-        param.setOrderNo("LXT12321321");
-        param.setOrderType("浜よ揣鍗�");
-        param.setOrderTime(DateUtils.convert(new Date()));
-        List<DetlDto> orderDetails = new ArrayList<>();
-        param.setOrderDetails(orderDetails);
-        DetlDto detlDto = new DetlDto("15099-10000", 3.0);
-        orderDetails.add(detlDto);
-        System.out.println(JSON.toJSONString(param));
-    }
+
 
 }

--
Gitblit v1.9.1