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/TaskLog.java | 558 +++++++++++++++++++++++++++---------------------------
1 files changed, 279 insertions(+), 279 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/TaskLog.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/TaskLog.java
index 0d7ed7c..2984c6c 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/TaskLog.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/TaskLog.java
@@ -1,279 +1,279 @@
-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.common.utils.Synchro;
-import com.zy.asrs.wms.asrs.service.TaskStsService;
-import com.zy.asrs.wms.asrs.service.TaskTypeService;
-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 java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("man_task_log")
-public class TaskLog implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * ID
- */
- @ApiModelProperty(value= "ID")
- @TableId(value = "id", type = IdType.INPUT)
- private Long id;
-
- /**
- * 浠诲姟缂栧彿
- */
- @ApiModelProperty(value= "浠诲姟缂栧彿")
- private String taskNo;
-
- /**
- * 浠诲姟鐘舵��
- */
- @ApiModelProperty(value= "浠诲姟鐘舵��")
- private Long taskSts;
-
- /**
- * 浠诲姟绫诲瀷
- */
- @ApiModelProperty(value= "浠诲姟绫诲瀷")
- private Long taskType;
-
- /**
- * 浼樺厛绾�
- */
- @ApiModelProperty(value= "浼樺厛绾�")
- private Integer ioPri;
-
- /**
- * 婧愬簱浣�
- */
- @ApiModelProperty(value= "婧愬簱浣�")
- private String originLoc;
-
- /**
- * 鐩爣搴撲綅
- */
- @ApiModelProperty(value= "鐩爣搴撲綅")
- private String targetLoc;
-
- /**
- * 婧愮珯鐐�
- */
- @ApiModelProperty(value= "婧愮珯鐐�")
- private String originSite;
-
- /**
- * 鐩爣绔欑偣
- */
- @ApiModelProperty(value= "鐩爣绔欑偣")
- private String targetSite;
-
- /**
- * 鎵樼洏鐮�
- */
- @ApiModelProperty(value= "鎵樼洏鐮�")
- private String barcode;
-
- /**
- * 鎵�灞炴満鏋�
- */
- @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 TaskLog() {}
-
- public TaskLog(String taskNo,Long taskSts,Long taskType,Integer ioPri,String originLoc,String targetLoc,String originSite,String targetSite,String barcode,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
- this.taskNo = taskNo;
- this.taskSts = taskSts;
- this.taskType = taskType;
- this.ioPri = ioPri;
- this.originLoc = originLoc;
- this.targetLoc = targetLoc;
- this.originSite = originSite;
- this.targetSite = targetSite;
- this.barcode = barcode;
- this.hostId = hostId;
- this.status = status;
- this.deleted = deleted;
- this.createTime = createTime;
- this.createBy = createBy;
- this.updateTime = updateTime;
- this.updateBy = updateBy;
- this.memo = memo;
- }
-
-// TaskLog taskLog = new TaskLog(
-// null, // 浠诲姟缂栧彿
-// null, // 浠诲姟鐘舵��
-// null, // 浠诲姟绫诲瀷
-// null, // 浼樺厛绾�
-// null, // 婧愬簱浣�
-// null, // 鐩爣搴撲綅
-// null, // 婧愮珯鐐�
-// null, // 鐩爣绔欑偣
-// null, // 鎵樼洏鐮�
-// null, // 鎵�灞炴満鏋�
-// null, // 鐘舵��
-// null, // 鏄惁鍒犻櫎
-// null, // 娣诲姞鏃堕棿
-// null, // 娣诲姞浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 淇敼浜哄憳
-// null // 澶囨敞
-// );
-
- public String getTaskSts$(){
- TaskStsService service = SpringUtils.getBean(TaskStsService.class);
- TaskSts taskSts = service.getById(this.taskSts);
- if (!Cools.isEmpty(taskSts)){
- return String.valueOf(taskSts.getTitle());
- }
- return null;
- }
-
- public String getTaskType$(){
- TaskTypeService service = SpringUtils.getBean(TaskTypeService.class);
- TaskType taskType = service.getById(this.taskType);
- if (!Cools.isEmpty(taskType)){
- return String.valueOf(taskType.getTitle());
- }
- 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);
- }
-
-
-}
+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.common.utils.Synchro;
+import com.zy.asrs.wms.asrs.service.TaskStsService;
+import com.zy.asrs.wms.asrs.service.TaskTypeService;
+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 java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("man_task_log")
+public class TaskLog implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 浠诲姟缂栧彿
+ */
+ @ApiModelProperty(value= "浠诲姟缂栧彿")
+ private String taskNo;
+
+ /**
+ * 浠诲姟鐘舵��
+ */
+ @ApiModelProperty(value= "浠诲姟鐘舵��")
+ private Long taskSts;
+
+ /**
+ * 浠诲姟绫诲瀷
+ */
+ @ApiModelProperty(value= "浠诲姟绫诲瀷")
+ private Long taskType;
+
+ /**
+ * 浼樺厛绾�
+ */
+ @ApiModelProperty(value= "浼樺厛绾�")
+ private Integer ioPri;
+
+ /**
+ * 婧愬簱浣�
+ */
+ @ApiModelProperty(value= "婧愬簱浣�")
+ private String originLoc;
+
+ /**
+ * 鐩爣搴撲綅
+ */
+ @ApiModelProperty(value= "鐩爣搴撲綅")
+ private String targetLoc;
+
+ /**
+ * 婧愮珯鐐�
+ */
+ @ApiModelProperty(value= "婧愮珯鐐�")
+ private String originSite;
+
+ /**
+ * 鐩爣绔欑偣
+ */
+ @ApiModelProperty(value= "鐩爣绔欑偣")
+ private String targetSite;
+
+ /**
+ * 鎵樼洏鐮�
+ */
+ @ApiModelProperty(value= "鎵樼洏鐮�")
+ private String barcode;
+
+ /**
+ * 鎵�灞炴満鏋�
+ */
+ @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 TaskLog() {}
+
+ public TaskLog(String taskNo,Long taskSts,Long taskType,Integer ioPri,String originLoc,String targetLoc,String originSite,String targetSite,String barcode,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
+ this.taskNo = taskNo;
+ this.taskSts = taskSts;
+ this.taskType = taskType;
+ this.ioPri = ioPri;
+ this.originLoc = originLoc;
+ this.targetLoc = targetLoc;
+ this.originSite = originSite;
+ this.targetSite = targetSite;
+ this.barcode = barcode;
+ this.hostId = hostId;
+ this.status = status;
+ this.deleted = deleted;
+ this.createTime = createTime;
+ this.createBy = createBy;
+ this.updateTime = updateTime;
+ this.updateBy = updateBy;
+ this.memo = memo;
+ }
+
+// TaskLog taskLog = new TaskLog(
+// null, // 浠诲姟缂栧彿
+// null, // 浠诲姟鐘舵��
+// null, // 浠诲姟绫诲瀷
+// null, // 浼樺厛绾�
+// null, // 婧愬簱浣�
+// null, // 鐩爣搴撲綅
+// null, // 婧愮珯鐐�
+// null, // 鐩爣绔欑偣
+// null, // 鎵樼洏鐮�
+// null, // 鎵�灞炴満鏋�
+// null, // 鐘舵��
+// null, // 鏄惁鍒犻櫎
+// null, // 娣诲姞鏃堕棿
+// null, // 娣诲姞浜哄憳
+// null, // 淇敼鏃堕棿
+// null, // 淇敼浜哄憳
+// null // 澶囨敞
+// );
+
+ public String getTaskSts$(){
+ TaskStsService service = SpringUtils.getBean(TaskStsService.class);
+ TaskSts taskSts = service.getById(this.taskSts);
+ if (!Cools.isEmpty(taskSts)){
+ return String.valueOf(taskSts.getTitle());
+ }
+ return null;
+ }
+
+ public String getTaskType$(){
+ TaskTypeService service = SpringUtils.getBean(TaskTypeService.class);
+ TaskType taskType = service.getById(this.taskType);
+ if (!Cools.isEmpty(taskType)){
+ return String.valueOf(taskType.getTitle());
+ }
+ 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);
+ }
+
+
+}
--
Gitblit v1.9.1