From 01f39fcb06b8713901975153d0a893e86eca6a88 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 07 七月 2025 19:42:26 +0800
Subject: [PATCH] 33.订单历史管理里面增加单据类型选项按钮、单据类型选项按钮 34.单据管理里面增加单据状态选项按钮 35.入库订单全部都入好了,单据状态还是作业中,现在作业中的单据是可以删除的,我不小心把这个单据删除了,怎么恢复? 36.每个界面点下一页都没反应,点第二页是有变化的,之后点任何页面都没反应 37.订单明细点开后的界面改大一点 38.新增出库订单的时候可以输入客户信息(客户名称、收件人、地址、电话等),现在拣货完成后连发给谁都不知道 39.大屏播种界面对应的数量和开单数量不一致

---
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/OrderOutMergeParam.java |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/OrderOutMergeParam.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/OrderOutMergeParam.java
index 5ab5df0..dabe13b 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/OrderOutMergeParam.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/OrderOutMergeParam.java
@@ -1,25 +1,45 @@
 package com.zy.asrs.wms.asrs.entity.param;
 
+import com.mysql.cj.log.Log;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.util.List;
 
 @Data
+@Accessors(chain = true)
+@ApiModel(value = "OrderOutMergeParam", description = "鍑哄簱鍚堝苟鍙傛暟")
 public class OrderOutMergeParam implements Serializable {
 
+    @ApiModelProperty("搴撲綅ID")
     private Long locId;
 
+    @ApiModelProperty("搴撲綅鍙�")
     private String locNo;
 
+    @ApiModelProperty("搴撲綅鏄庣粏ID")
     private Long locDetlId;
 
+    @ApiModelProperty("鐗╂枡鐮�")
     private String matnr;
 
+    @ApiModelProperty("鎵规")
     private String batch;
 
+    @ApiModelProperty("鎵ц鏁伴噺")
+    private Long workQty;
+
+    @ApiModelProperty("搴撲綅绫诲瀷")
+    private Long typeId;
+
+    @ApiModelProperty("鏁伴噺")
     private Double anfme;
 
+    @ApiModelProperty("绔欑偣")
     private Long operationPort;
 
     private List<FieldParam> fieldParams;

--
Gitblit v1.9.1