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/system/entity/OperationRecord.java | 378 +++++++++++++++++++++++++++---------------------------
1 files changed, 189 insertions(+), 189 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/OperationRecord.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/OperationRecord.java
index b756848..6f545d5 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/OperationRecord.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/OperationRecord.java
@@ -1,189 +1,189 @@
-package com.zy.asrs.wms.system.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.SpringUtils;
-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.text.SimpleDateFormat;
-import java.util.Date;
-
-@Data
-@TableName("sys_operation_record")
-public class OperationRecord 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 namespace;
-
- /**
- * 鎺ュ彛鍦板潃
- */
- @ApiModelProperty(value= "鎺ュ彛鍦板潃")
- private String url;
-
- /**
- * 骞冲彴瀵嗛挜
- */
- @ApiModelProperty(value= "骞冲彴瀵嗛挜")
- private String appkey;
-
- /**
- * 鏃堕棿鎴�
- */
- @ApiModelProperty(value= "鏃堕棿鎴�")
- private String timestamp;
-
- /**
- * 瀹㈡埛绔疘P
- */
- @ApiModelProperty(value= "瀹㈡埛绔疘P")
- private String clientIp;
-
- /**
- * 璇锋眰鍐呭
- */
- @ApiModelProperty(value= "璇锋眰鍐呭")
- private String request;
-
- /**
- * 鍝嶅簲鍐呭
- */
- @ApiModelProperty(value= "鍝嶅簲鍐呭")
- private String response;
-
- /**
- * 娑堣�楁椂闂�
- */
- @ApiModelProperty(value= "娑堣�楁椂闂�")
- private Integer spendTime;
-
- /**
- * 寮傚父鍐呭
- */
- @ApiModelProperty(value= "寮傚父鍐呭")
- private String err;
-
- /**
- * 缁撴灉 1: 鎴愬姛 0: 澶辫触
- */
- @ApiModelProperty(value= "缁撴灉 1: 鎴愬姛 0: 澶辫触 ")
- private Integer result;
-
- /**
- * 鐢ㄦ埛
- */
- @ApiModelProperty(value= "鐢ㄦ埛")
- private Long userId;
-
- /**
- * 鎵�灞炴満鏋�
- */
- @ApiModelProperty(value= "鎵�灞炴満鏋�")
- private Long hostId;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
-
- public OperationRecord() {}
-
- public OperationRecord(String namespace, String url, String appkey, String timestamp, String clientIp, String request, String response, Integer spendTime, String err, Integer result, Long userId, Long hostId, Date createTime, String memo) {
- this.namespace = namespace;
- this.url = url;
- this.appkey = appkey;
- this.timestamp = timestamp;
- this.clientIp = clientIp;
- this.request = request;
- this.response = response;
- this.spendTime = spendTime;
- this.err = err;
- this.result = result;
- this.userId = userId;
- this.hostId = hostId;
- this.createTime = createTime;
- this.memo = memo;
- }
-
-// OperationRecord operationRecord = new OperationRecord(
-// null, // 鍚嶇О绌洪棿
-// null, // 鎺ュ彛鍦板潃
-// null, // 骞冲彴瀵嗛挜
-// null, // 鏃堕棿鎴�
-// null, // 瀹㈡埛绔疘P
-// null, // 璇锋眰鍐呭
-// null, // 鍝嶅簲鍐呭
-// null, // 寮傚父鍐呭
-// null, // 缁撴灉
-// null, // 鐢ㄦ埛
-// null, // 鎵�灞炴満鏋�
-// null, // 娣诲姞鏃堕棿
-// null // 澶囨敞
-// );
-
- public String getResult$(){
- if (null == this.result){ return null; }
- switch (this.result){
- case 1:
- return "鎴愬姛";
- case 0:
- return "澶辫触";
- default:
- return String.valueOf(this.result);
- }
- }
-
- public String getUserId$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.userId);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- 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 getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
-
-}
+package com.zy.asrs.wms.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.SpringUtils;
+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.text.SimpleDateFormat;
+import java.util.Date;
+
+@Data
+@TableName("sys_operation_record")
+public class OperationRecord 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 namespace;
+
+ /**
+ * 鎺ュ彛鍦板潃
+ */
+ @ApiModelProperty(value= "鎺ュ彛鍦板潃")
+ private String url;
+
+ /**
+ * 骞冲彴瀵嗛挜
+ */
+ @ApiModelProperty(value= "骞冲彴瀵嗛挜")
+ private String appkey;
+
+ /**
+ * 鏃堕棿鎴�
+ */
+ @ApiModelProperty(value= "鏃堕棿鎴�")
+ private String timestamp;
+
+ /**
+ * 瀹㈡埛绔疘P
+ */
+ @ApiModelProperty(value= "瀹㈡埛绔疘P")
+ private String clientIp;
+
+ /**
+ * 璇锋眰鍐呭
+ */
+ @ApiModelProperty(value= "璇锋眰鍐呭")
+ private String request;
+
+ /**
+ * 鍝嶅簲鍐呭
+ */
+ @ApiModelProperty(value= "鍝嶅簲鍐呭")
+ private String response;
+
+ /**
+ * 娑堣�楁椂闂�
+ */
+ @ApiModelProperty(value= "娑堣�楁椂闂�")
+ private Integer spendTime;
+
+ /**
+ * 寮傚父鍐呭
+ */
+ @ApiModelProperty(value= "寮傚父鍐呭")
+ private String err;
+
+ /**
+ * 缁撴灉 1: 鎴愬姛 0: 澶辫触
+ */
+ @ApiModelProperty(value= "缁撴灉 1: 鎴愬姛 0: 澶辫触 ")
+ private Integer result;
+
+ /**
+ * 鐢ㄦ埛
+ */
+ @ApiModelProperty(value= "鐢ㄦ埛")
+ private Long userId;
+
+ /**
+ * 鎵�灞炴満鏋�
+ */
+ @ApiModelProperty(value= "鎵�灞炴満鏋�")
+ private Long hostId;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ public OperationRecord() {}
+
+ public OperationRecord(String namespace, String url, String appkey, String timestamp, String clientIp, String request, String response, Integer spendTime, String err, Integer result, Long userId, Long hostId, Date createTime, String memo) {
+ this.namespace = namespace;
+ this.url = url;
+ this.appkey = appkey;
+ this.timestamp = timestamp;
+ this.clientIp = clientIp;
+ this.request = request;
+ this.response = response;
+ this.spendTime = spendTime;
+ this.err = err;
+ this.result = result;
+ this.userId = userId;
+ this.hostId = hostId;
+ this.createTime = createTime;
+ this.memo = memo;
+ }
+
+// OperationRecord operationRecord = new OperationRecord(
+// null, // 鍚嶇О绌洪棿
+// null, // 鎺ュ彛鍦板潃
+// null, // 骞冲彴瀵嗛挜
+// null, // 鏃堕棿鎴�
+// null, // 瀹㈡埛绔疘P
+// null, // 璇锋眰鍐呭
+// null, // 鍝嶅簲鍐呭
+// null, // 寮傚父鍐呭
+// null, // 缁撴灉
+// null, // 鐢ㄦ埛
+// null, // 鎵�灞炴満鏋�
+// null, // 娣诲姞鏃堕棿
+// null // 澶囨敞
+// );
+
+ public String getResult$(){
+ if (null == this.result){ return null; }
+ switch (this.result){
+ case 1:
+ return "鎴愬姛";
+ case 0:
+ return "澶辫触";
+ default:
+ return String.valueOf(this.result);
+ }
+ }
+
+ public String getUserId$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.getById(this.userId);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ 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 getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+
+}
--
Gitblit v1.9.1