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/ViewLocDetl.java | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java
index bf47a32..d468ece 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java
@@ -95,6 +95,15 @@
@ApiModelProperty("鍨嬪彿")
private String model;
+ @ApiModelProperty("鍝佺墝")
+ private String brand;
+
+ @ApiModelProperty("棰滆壊")
+ private String color;
+
+ @ApiModelProperty("浜у湴")
+ private String origin;
+
/**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
@@ -188,14 +197,14 @@
// null // 澶囨敞
// );
- public String getLocId$(){
- LocService service = SpringUtils.getBean(LocService.class);
- Loc loc = service.getById(this.locId);
- if (!Cools.isEmpty(loc)){
- return String.valueOf(loc.getLocNo());
- }
- return null;
- }
+// public String getLocId$(){
+// LocService service = SpringUtils.getBean(LocService.class);
+// Loc loc = service.getById(this.locId);
+// if (!Cools.isEmpty(loc)){
+// return String.valueOf(loc.getLocNo());
+// }
+// return null;
+// }
public String getTagId$() {
TagService tagService = SpringUtils.getBean(TagService.class);
@@ -206,18 +215,13 @@
return null;
}
-
-// @Delegate(types = Mat.class)
-// public Mat getMatId$(){
-// MatService service = SpringUtils.getBean(MatService.class);
-// Mat mat = service.getById(this.matId);
-// return mat;
-// }
+ public String getType$() {
+ return (this.locNo.contains("B") || this.locNo.contains("C")) ? "骞冲簱" : "绔嬪簱";
+ }
public String getDewell$() {
return DateUtils.diff(new Date(), createTime) + "澶�";
}
-
public String getHostId$(){
HostService service = SpringUtils.getBean(HostService.class);
--
Gitblit v1.9.1