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/common/domain/BaseParam.java | 110 ++++++++++++++++++++++++++++--------------------------- 1 files changed, 56 insertions(+), 54 deletions(-) diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/domain/BaseParam.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/domain/BaseParam.java index bea1f3b..9145e52 100644 --- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/domain/BaseParam.java +++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/domain/BaseParam.java @@ -1,54 +1,56 @@ -package com.zy.asrs.wms.common.domain; - -import com.baomidou.mybatisplus.annotation.TableField; -import lombok.Data; - -import java.io.Serializable; -import java.util.Map; - -/** - * Created by vincent on 2/13/2024 - */ -@Data -public class BaseParam implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableField(exist = false) - private Integer current; - - @TableField(exist = false) - private Integer pageSize; - - @TableField(exist = false) - private String timeStart; - - @TableField(exist = false) - private String timeEnd; - - @TableField(exist = false) - private String condition; - - @TableField(exist = false) - private Map<String, Object> map; - - public void syncMap(Map<String, Object> map) { - if (null == map) { - return; - } - if (null != map.get("current")) { - this.setCurrent(Integer.parseInt(String.valueOf(map.get("current")))); - map.remove("current"); - } - if (null != map.get("pageSize")) { - this.setPageSize(Integer.parseInt(String.valueOf(map.get("pageSize")))); - map.remove("pageSize"); - } - if (null != map.get("condition")) { - this.setCondition(String.valueOf(map.get("condition"))); - map.remove("condition"); - } - this.setMap(map); - } - -} +package com.zy.asrs.wms.common.domain; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.Data; + +import java.io.Serializable; +import java.util.Map; + +/** + * Created by vincent on 2/13/2024 + */ +@Data +public class BaseParam implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableField(exist = false) + private Integer current; + + @TableField(exist = false) + private Integer pageSize; + + @TableField(exist = false) + private String timeStart; + + @TableField(exist = false) + private String timeEnd; + + @TableField(exist = false) + private String condition; + + @TableField(exist = false) + private Map<String, Object> map; + + public void syncMap(Map<String, Object> map) { + if (null == map) { + return; + } + if (null != map.get("current")) { + this.setCurrent(Integer.parseInt(String.valueOf(map.get("current")))); + map.remove("current"); + } + if (null != map.get("pageSize")) { + this.setPageSize(Integer.parseInt(String.valueOf(map.get("pageSize")))); + map.remove("pageSize"); + } + if (null != map.get("condition")) { + this.setCondition(String.valueOf(map.get("condition"))); + map.remove("condition"); + } + this.setMap(map); + } + +} -- Gitblit v1.9.1