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 | 671 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 360 insertions(+), 311 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 54a42a0..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
@@ -1,311 +1,360 @@
-package com.zy.asrs.wms.asrs.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.zy.asrs.common.utils.Synchro;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.SpringUtils;
-import com.zy.asrs.wms.asrs.service.LocService;
-import com.zy.asrs.wms.asrs.service.MatService;
-import com.zy.asrs.wms.system.entity.Host;
-import com.zy.asrs.wms.system.entity.User;
-import com.zy.asrs.wms.system.service.HostService;
-import com.zy.asrs.wms.system.service.UserService;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.lang.reflect.Field;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-@Data
-@TableName("view_man_loc_detl")
-public class ViewLocDetl implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * ID
- */
- @ApiModelProperty(value= "ID")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 搴撲綅
- */
- @ApiModelProperty(value= "搴撲綅")
- private Long locId;
-
- /**
- * 搴撲綅鍙�
- */
- @ApiModelProperty(value= "搴撲綅鍙�")
- private String locNo;
-
- /**
- * 鍟嗗搧
- */
- @ApiModelProperty(value= "鍟嗗搧")
- private Long matId;
-
- /**
- * 鍟嗗搧缂栧彿
- */
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
- private String matnr;
-
- /**
- * 璁㈠崟鍙�
- */
- @ApiModelProperty(value= "璁㈠崟鍙�")
- private String orderNo;
-
- /**
- * 鎵瑰彿
- */
- @ApiModelProperty(value= "鎵瑰彿")
- private String batch;
-
- /**
- * 鏁伴噺
- */
- @ApiModelProperty(value= "鏁伴噺")
- private Double anfme;
-
- /**
- * 鎵�灞炴満鏋�
- */
- @ApiModelProperty(value= "鎵�灞炴満鏋�")
- private Long hostId;
-
- /**
- * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
- */
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
- private Integer status;
-
- /**
- * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
- */
- @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
- private Integer deleted;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 娣诲姞浜哄憳
- */
- @ApiModelProperty(value= "娣诲姞浜哄憳")
- private Long createBy;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long updateBy;
-
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
-
- public ViewLocDetl() {}
-
- public ViewLocDetl(Long locId, String locNo, Long matId, String matnr, String orderNo, String batch, Double anfme, Long hostId, Integer status, Integer deleted, Date createTime, Long createBy, Date updateTime, Long updateBy, String memo) {
- this.locId = locId;
- this.locNo = locNo;
- this.matId = matId;
- this.matnr = matnr;
- this.orderNo = orderNo;
- this.batch = batch;
- this.anfme = anfme;
- this.hostId = hostId;
- this.status = status;
- this.deleted = deleted;
- this.createTime = createTime;
- this.createBy = createBy;
- this.updateTime = updateTime;
- this.updateBy = updateBy;
- this.memo = memo;
- }
-
-// LocDetl locDetl = new LocDetl(
-// null, // 搴撲綅
-// null, // 搴撲綅鍙穂闈炵┖]
-// null, // 鐗╂枡
-// null, // 鍟嗗搧缂栧彿
-// null, // 璁㈠崟鍙�
-// null, // 鎵瑰彿
-// null, // 鏁伴噺
-// null, // 鎵╁睍
-// null, // 鎵�灞炴満鏋�
-// null, // 鐘舵��
-// null, // 鏄惁鍒犻櫎
-// null, // 娣诲姞鏃堕棿
-// null, // 娣诲姞浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 淇敼浜哄憳
-// 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 getMatId$(){
- MatService service = SpringUtils.getBean(MatService.class);
- Mat mat = service.getById(this.matId);
- if (!Cools.isEmpty(mat)){
- return String.valueOf(mat.getId());
- }
- return null;
- }
-
- public String getHostId$(){
- HostService service = SpringUtils.getBean(HostService.class);
- Host host = service.getById(this.hostId);
- if (!Cools.isEmpty(host)){
- return String.valueOf(host.getName());
- }
- return null;
- }
-
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
- case 1:
- return "姝ｅ父";
- case 0:
- return "绂佺敤";
- default:
- return String.valueOf(this.status);
- }
- }
-
- public String getDeleted$(){
- if (null == this.deleted){ return null; }
- switch (this.deleted){
- case 1:
- return "鏄�";
- case 0:
- return "鍚�";
- default:
- return String.valueOf(this.deleted);
- }
- }
-
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- public String getCreateBy$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.createBy);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
- }
-
- public String getUpdateBy$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.updateBy);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
- public void sync(Object source) {
- Synchro.Copy(source, this);
- }
-
- //鍔ㄦ�佹墿灞曞瓧娈�
- public transient Map<String, Object> dynamicFields = new HashMap<>();
-
- @JsonAnyGetter
- public Map<String,Object> getDynamicFields() {
- return dynamicFields;
- }
-
- public void syncField(List<LocDetlField> list) {
- ArrayList<String> keys = new ArrayList<>();
- Field[] fields = this.getClass().getFields();
- for (Field field : fields) {
- keys.add(field.getName());
- }
-
- Map<String, Object> dynamicFields = new HashMap<>();
- for (LocDetlField locDetlField : list) {
- if (keys.contains(locDetlField.getName())) {
- continue;
- }
- dynamicFields.put(locDetlField.getName(), locDetlField.getValue());
- }
-
- this.dynamicFields = dynamicFields;
- }
-
- public void syncFieldMap(Map<String, Object> map) {
- ArrayList<String> keys = new ArrayList<>();
- Field[] fields = this.getClass().getDeclaredFields();
- for (Field field : fields) {
- keys.add(field.getName());
- }
- keys.add("detlId");
-
- Map<String, Object> dynamicFields = new HashMap<>();
- for (Map.Entry<String, Object> entry : map.entrySet()) {
- if (keys.contains(entry.getKey())) {
- continue;
- }
- dynamicFields.put(entry.getKey(), entry.getValue());
- }
-
- this.dynamicFields = dynamicFields;
- }
-
- public String getFieldString(String key) {
- return dynamicFields.get(key).toString();
- }
-
- public void setField(String key, Object value) {
- dynamicFields.put(key, value);
- }
-
-}
+package com.zy.asrs.wms.asrs.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.zy.asrs.common.utils.Synchro;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.DateUtils;
+import com.zy.asrs.framework.common.SpringUtils;
+import com.zy.asrs.wms.asrs.service.LocService;
+import com.zy.asrs.wms.asrs.service.MatService;
+import com.zy.asrs.wms.asrs.service.TagService;
+import com.zy.asrs.wms.system.entity.Host;
+import com.zy.asrs.wms.system.entity.User;
+import com.zy.asrs.wms.system.service.HostService;
+import com.zy.asrs.wms.system.service.UserService;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Delegate;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.lang.reflect.Field;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@Data
+@TableName("view_man_loc_detl")
+public class ViewLocDetl implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ private Long id;
+
+ /**
+ * 搴撲綅
+ */
+ @ApiModelProperty(value= "搴撲綅")
+ private Long locId;
+
+ /**
+ * 搴撲綅鍙�
+ */
+ @ApiModelProperty(value= "搴撲綅鍙�")
+ private String locNo;
+
+ /**
+ * 鍟嗗搧
+ */
+ @ApiModelProperty(value= "鍟嗗搧")
+ private Long matId;
+
+ /**
+ * 鍟嗗搧缂栧彿
+ */
+ @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ private String matnr;
+
+ /**
+ * 璁㈠崟鍙�
+ */
+ @ApiModelProperty(value= "璁㈠崟鍙�")
+ private String orderNo;
+
+ /**
+ * 鎵瑰彿
+ */
+ @ApiModelProperty(value= "鎵瑰彿")
+ private String batch;
+
+ /**
+ * 鏁伴噺
+ */
+ @ApiModelProperty(value= "鏁伴噺")
+ private Double anfme;
+
+ /**
+ * 鎵�灞炴満鏋�
+ */
+ @ApiModelProperty(value= "鎵�灞炴満鏋�")
+ private Long hostId;
+
+ @ApiModelProperty("鐗╂枡鍚嶇О")
+ private String maktx;
+
+ @ApiModelProperty("瑙勬牸")
+ private String specs;
+
+ @ApiModelProperty("鍨嬪彿")
+ private String model;
+
+ @ApiModelProperty("鍝佺墝")
+ private String brand;
+
+ @ApiModelProperty("棰滆壊")
+ private String color;
+
+ @ApiModelProperty("浜у湴")
+ private String origin;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ private Integer status;
+
+ @ApiModelProperty("鍒嗙被鏍囪瘑")
+ private Long tagId;
+
+ /**
+ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
+ private Integer deleted;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value= "娣诲姞浜哄憳")
+ private Long createBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ private Long updateBy;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ /**
+ * 搴撳瓨鍐荤粨 1: 鍐荤粨 0: 姝ｅ父
+ */
+ @ApiModelProperty(value= "搴撳瓨鍐荤粨 1: 鍐荤粨 0: 姝ｅ父")
+ private Integer freeze;
+
+ public ViewLocDetl() {}
+
+ public ViewLocDetl(Long locId, String locNo, Long matId, String matnr, String orderNo, String batch, Double anfme, Long hostId, Integer status, Integer deleted, Date createTime, Long createBy, Date updateTime, Long updateBy, String memo) {
+ this.locId = locId;
+ this.locNo = locNo;
+ this.matId = matId;
+ this.matnr = matnr;
+ this.orderNo = orderNo;
+ this.batch = batch;
+ this.anfme = anfme;
+ this.hostId = hostId;
+ this.status = status;
+ this.deleted = deleted;
+ this.createTime = createTime;
+ this.createBy = createBy;
+ this.updateTime = updateTime;
+ this.updateBy = updateBy;
+ this.memo = memo;
+ }
+
+// LocDetl locDetl = new LocDetl(
+// null, // 搴撲綅
+// null, // 搴撲綅鍙穂闈炵┖]
+// null, // 鐗╂枡
+// null, // 鍟嗗搧缂栧彿
+// null, // 璁㈠崟鍙�
+// null, // 鎵瑰彿
+// null, // 鏁伴噺
+// null, // 鎵╁睍
+// null, // 鎵�灞炴満鏋�
+// null, // 鐘舵��
+// null, // 鏄惁鍒犻櫎
+// null, // 娣诲姞鏃堕棿
+// null, // 娣诲姞浜哄憳
+// null, // 淇敼鏃堕棿
+// null, // 淇敼浜哄憳
+// 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);
+ Tag byId = tagService.getById(this.tagId);
+ if (!Cools.isEmpty(byId)){
+ return byId.getName();
+ }
+ return null;
+ }
+
+ 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);
+ Host host = service.getById(this.hostId);
+ if (!Cools.isEmpty(host)){
+ return String.valueOf(host.getName());
+ }
+ return null;
+ }
+
+ public String getFreeze$(){
+ if (null == this.freeze){ return null; }
+ switch (this.freeze){
+ case 1:
+ return "鍐荤粨";
+ case 0:
+ return "姝ｅ父";
+ default:
+ return String.valueOf(this.freeze);
+ }
+ }
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "绂佺敤";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getDeleted$(){
+ if (null == this.deleted){ return null; }
+ switch (this.deleted){
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.deleted);
+ }
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getCreateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.createBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+ public String getUpdateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.updateBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
+
+ //鍔ㄦ�佹墿灞曞瓧娈�
+// public transient Map<String, Object> dynamicFields = new HashMap<>();
+
+// @JsonAnyGetter
+// public Map<String,Object> getDynamicFields() {
+// return dynamicFields;
+// }
+//
+// public void syncField(List<LocDetlField> list) {
+// ArrayList<String> keys = new ArrayList<>();
+// Field[] fields = this.getClass().getFields();
+// for (Field field : fields) {
+// keys.add(field.getName());
+// }
+//
+// Map<String, Object> dynamicFields = new HashMap<>();
+// for (LocDetlField locDetlField : list) {
+// if (keys.contains(locDetlField.getName())) {
+// continue;
+// }
+// dynamicFields.put(locDetlField.getName(), locDetlField.getValue());
+// }
+//
+// this.dynamicFields = dynamicFields;
+// }
+//
+// public void syncFieldMap(Map<String, Object> map) {
+// ArrayList<String> keys = new ArrayList<>();
+// Field[] fields = this.getClass().getDeclaredFields();
+// for (Field field : fields) {
+// keys.add(field.getName());
+// }
+// keys.add("detlId");
+//
+// Map<String, Object> dynamicFields = new HashMap<>();
+// for (Map.Entry<String, Object> entry : map.entrySet()) {
+// if (keys.contains(entry.getKey())) {
+// continue;
+// }
+// dynamicFields.put(entry.getKey(), entry.getValue());
+// }
+//
+// this.dynamicFields = dynamicFields;
+// }
+//
+// public String getFieldString(String key) {
+// return dynamicFields.get(key).toString();
+// }
+//
+// public void setField(String key, Object value) {
+// dynamicFields.put(key, value);
+// }
+
+}
--
Gitblit v1.9.1