From d0226747665355acecd5b4f2b5c0beb020586729 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 17 一月 2025 15:37:32 +0800
Subject: [PATCH] # 23. PDA拣货单据，勾选或点击确认按钮后，完成当前单据 （已完成） 24. PDA出库成功后，界面数据重置，避免重复操作 （已修复） 25. PDA接口请求，添加一个Loading遮档 （已修复） 27. 非平库单据，在平库可做入库操作 （已修复） 28. 平库已组拖数据，组拖完成后依然可组拖 （已修复） 29. 平库入库后，订单明细没有添加（已修复） 30. 平库入库后，单据类型没有修改（已修复） 31. 没有绑定播种位，不能进行播种，前后端都需加判定（已修复） 33. 平库入库未修改入库已完成数量（已修复） 34. cacheSite缓存站点逻辑需重新梳理，入库生成波次时（已完成） 35. PDA添加发货确认，默认全选 （已修复） 36. 大屏获取任务时，是由容器到达的拖盘码确认通知 （已修复） 37. 拣货单序号不显示 问题修复 （已修复） 42. pda发货确认，添加不同颜色区分是否全部完成拣货，绿色全部拣货完成，红色完成部分拣货（已修复） 43. CTU入库完成后，订单明细没有删除，执行中数量清空（已修复） 44. 平库入库完成后，历史档明细完成数量没有更新 （已修复） 45. PDA料号不显示 （已修复） 46. 发货完成后，波次管理数据未加入历史档 （已修复）
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/SuggestLocRule.java | 576 ++++++++++++++++++++++++++++----------------------------
1 files changed, 288 insertions(+), 288 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/SuggestLocRule.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/SuggestLocRule.java
index 3b59135..a41e40e 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/SuggestLocRule.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/SuggestLocRule.java
@@ -1,288 +1,288 @@
-package com.zy.asrs.wms.asrs.entity;
-
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-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 org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-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 io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.SpringUtils;
-import com.zy.asrs.wms.system.service.UserService;
-import com.zy.asrs.wms.system.service.HostService;
-import com.zy.asrs.common.utils.Synchro;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("strategy_suggest_loc_rule")
-public class SuggestLocRule 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 matId;
-
- /**
- * 鎵瑰彿
- */
- @ApiModelProperty(value= "鎵瑰彿")
- private String batch;
-
- /**
- * 璧峰鎺�
- */
- @ApiModelProperty(value= "璧峰鎺�")
- private Integer startRow;
-
- /**
- * 缁撴潫鎺�
- */
- @ApiModelProperty(value= "缁撴潫鎺�")
- private Integer targetRow;
-
- /**
- * 璧峰鍒�
- */
- @ApiModelProperty(value= "璧峰鍒�")
- private Integer startBay;
-
- /**
- * 缁撴潫鍒�
- */
- @ApiModelProperty(value= "缁撴潫鍒�")
- private Integer targetBay;
-
- /**
- * 璧峰灞�
- */
- @ApiModelProperty(value= "璧峰灞�")
- private Integer startLev;
-
- /**
- * 缁撴潫灞�
- */
- @ApiModelProperty(value= "缁撴潫灞�")
- private Integer targetLev;
-
- /**
- * 鎵�灞炴満鏋�
- */
- @ApiModelProperty(value= "鎵�灞炴満鏋�")
- private Long hostId;
-
- /**
- * 搴撲綅绫诲瀷 1: 婊℃墭 0: 绌烘墭
- */
- @ApiModelProperty(value= "搴撲綅绫诲瀷 1: 婊℃墭 0: 绌烘墭 ")
- private Integer locType;
-
- /**
- * 鐘舵�� 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 SuggestLocRule() {}
-
- public SuggestLocRule(Long matId,String batch,Integer startRow,Integer targetRow,Integer startBay,Integer targetBay,Integer startLev,Integer targetLev,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
- this.matId = matId;
- this.batch = batch;
- this.startRow = startRow;
- this.targetRow = targetRow;
- this.startBay = startBay;
- this.targetBay = targetBay;
- this.startLev = startLev;
- this.targetLev = targetLev;
- this.hostId = hostId;
- this.status = status;
- this.deleted = deleted;
- this.createTime = createTime;
- this.createBy = createBy;
- this.updateTime = updateTime;
- this.updateBy = updateBy;
- this.memo = memo;
- }
-
-// SuggestLocRule suggestLocRule = new SuggestLocRule(
-// null, // 鍟嗗搧
-// null, // 鎵瑰彿
-// null, // 璧峰鎺�
-// null, // 缁撴潫鎺�
-// null, // 璧峰鍒�
-// null, // 缁撴潫鍒�
-// null, // 璧峰灞�
-// null, // 缁撴潫灞�
-// null, // 鎵�灞炴満鏋�
-// null, // 鐘舵��
-// null, // 鏄惁鍒犻櫎
-// null, // 娣诲姞鏃堕棿
-// null, // 娣诲姞浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 淇敼浜哄憳
-// null // 澶囨敞
-// );
-
- public Mat getMat$(){
- MatService service = SpringUtils.getBean(MatService.class);
- Mat mat = service.getById(this.matId);
- if (!Cools.isEmpty(mat)){
- return mat;
- }
- 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 getLocType$(){
- if (null == this.locType){ return null; }
- switch (this.locType){
- case 1:
- return "婊℃墭";
- case 0:
- return "绌烘墭";
- default:
- return String.valueOf(this.locType);
- }
- }
-
- 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);
- }
-}
+package com.zy.asrs.wms.asrs.entity;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+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 org.springframework.format.annotation.DateTimeFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.SpringUtils;
+import com.zy.asrs.wms.system.service.UserService;
+import com.zy.asrs.wms.system.service.HostService;
+import com.zy.asrs.common.utils.Synchro;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("strategy_suggest_loc_rule")
+public class SuggestLocRule 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 matId;
+
+ /**
+ * 鎵瑰彿
+ */
+ @ApiModelProperty(value= "鎵瑰彿")
+ private String batch;
+
+ /**
+ * 璧峰鎺�
+ */
+ @ApiModelProperty(value= "璧峰鎺�")
+ private Integer startRow;
+
+ /**
+ * 缁撴潫鎺�
+ */
+ @ApiModelProperty(value= "缁撴潫鎺�")
+ private Integer targetRow;
+
+ /**
+ * 璧峰鍒�
+ */
+ @ApiModelProperty(value= "璧峰鍒�")
+ private Integer startBay;
+
+ /**
+ * 缁撴潫鍒�
+ */
+ @ApiModelProperty(value= "缁撴潫鍒�")
+ private Integer targetBay;
+
+ /**
+ * 璧峰灞�
+ */
+ @ApiModelProperty(value= "璧峰灞�")
+ private Integer startLev;
+
+ /**
+ * 缁撴潫灞�
+ */
+ @ApiModelProperty(value= "缁撴潫灞�")
+ private Integer targetLev;
+
+ /**
+ * 鎵�灞炴満鏋�
+ */
+ @ApiModelProperty(value= "鎵�灞炴満鏋�")
+ private Long hostId;
+
+ /**
+ * 搴撲綅绫诲瀷 1: 婊℃墭 0: 绌烘墭
+ */
+ @ApiModelProperty(value= "搴撲綅绫诲瀷 1: 婊℃墭 0: 绌烘墭 ")
+ private Integer locType;
+
+ /**
+ * 鐘舵�� 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 SuggestLocRule() {}
+
+ public SuggestLocRule(Long matId,String batch,Integer startRow,Integer targetRow,Integer startBay,Integer targetBay,Integer startLev,Integer targetLev,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
+ this.matId = matId;
+ this.batch = batch;
+ this.startRow = startRow;
+ this.targetRow = targetRow;
+ this.startBay = startBay;
+ this.targetBay = targetBay;
+ this.startLev = startLev;
+ this.targetLev = targetLev;
+ this.hostId = hostId;
+ this.status = status;
+ this.deleted = deleted;
+ this.createTime = createTime;
+ this.createBy = createBy;
+ this.updateTime = updateTime;
+ this.updateBy = updateBy;
+ this.memo = memo;
+ }
+
+// SuggestLocRule suggestLocRule = new SuggestLocRule(
+// null, // 鍟嗗搧
+// null, // 鎵瑰彿
+// null, // 璧峰鎺�
+// null, // 缁撴潫鎺�
+// null, // 璧峰鍒�
+// null, // 缁撴潫鍒�
+// null, // 璧峰灞�
+// null, // 缁撴潫灞�
+// null, // 鎵�灞炴満鏋�
+// null, // 鐘舵��
+// null, // 鏄惁鍒犻櫎
+// null, // 娣诲姞鏃堕棿
+// null, // 娣诲姞浜哄憳
+// null, // 淇敼鏃堕棿
+// null, // 淇敼浜哄憳
+// null // 澶囨敞
+// );
+
+ public Mat getMat$(){
+ MatService service = SpringUtils.getBean(MatService.class);
+ Mat mat = service.getById(this.matId);
+ if (!Cools.isEmpty(mat)){
+ return mat;
+ }
+ 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 getLocType$(){
+ if (null == this.locType){ return null; }
+ switch (this.locType){
+ case 1:
+ return "婊℃墭";
+ case 0:
+ return "绌烘墭";
+ default:
+ return String.valueOf(this.locType);
+ }
+ }
+
+ 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);
+ }
+}
--
Gitblit v1.9.1