From 08915b05c42b2ba97a8bb0809aeb48802ae63b46 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期五, 27 三月 2026 20:42:32 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 91 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 87 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index 635c2e0..a9804f8 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -2,8 +2,13 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.asrs.service.BasAreasService;
+import com.zy.asrs.service.LocCacheService;
+import com.zy.asrs.service.TaskLogService;
+import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
@@ -12,6 +17,7 @@
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.Objects;
@Data
@TableName("asr_wrk_detl_log")
@@ -69,6 +75,10 @@
@ApiModelProperty(value= "鍗曟嵁缂栧彿")
@TableField("order_no")
private String orderNo;
+
+ @ApiModelProperty(value= "鍗曟嵁id")
+ @TableField("order_id")
+ private Long orderId;
/**
* 瑙勬牸
@@ -273,19 +283,90 @@
* 澶囩敤1
*/
@ApiModelProperty(value= "澶囩敤1")
- private String standby1;
+ private String standby1 = "";
/**
* 澶囩敤2
*/
@ApiModelProperty(value= "澶囩敤2")
- private String standby2;
+ private String standby2 = "";
/**
* 澶囩敤3
*/
@ApiModelProperty(value= "澶囩敤3")
- private String standby3;
+ private String standby3 = "";
+
+ /**
+ * 澶囩敤1
+ */
+ @ApiModelProperty(value= "澶囩敤1")
+ @TableField("box_type1")
+ private String boxType1 = "1";
+
+ /**
+ * 澶囩敤2
+ */
+ @ApiModelProperty(value= "澶囩敤2")
+ @TableField("box_type2")
+ private String boxType2 = "1";
+
+ /**
+ * 澶囩敤3
+ */
+ @ApiModelProperty(value= "澶囩敤3")
+ @TableField("box_type3")
+ private String boxType3 = "1";
+
+ @ApiModelProperty("鐮存崯鏁�")
+ @TableField("adjust_qty")
+ private Double adjustQty;
+
+ @ApiModelProperty("涓婃灦鏁�")
+ @TableField("work_qty")
+ private Double workQty;
+
+ @ApiModelProperty("宸紓鏁�")
+ @TableField("splus_qty")
+ private Double splusQty;
+
+
+ /**
+ * 鑾峰彇搴撳尯绫诲瀷
+ *
+ * @return java.lang.String
+ * @author Ryan
+ * @date 2026/1/19 14:07
+ */
+ public String getAreaType() {
+ if (null == this.wrkNo) {
+ return null;
+ }
+ TaskLogService taskLogService = SpringUtils.getBean(TaskLogService.class);
+ TaskLog taskLog = taskLogService.selectOne(new EntityWrapper<TaskLog>().eq("wrk_no", this.wrkNo));
+ if (Objects.isNull(taskLog)) {
+ return null;
+ }
+ LocCacheService locCacheService = SpringUtils.getBean(LocCacheService.class);
+ LocCache locCache = locCacheService.selectOne(new EntityWrapper<LocCache>().eq("loc_no", taskLog.getLocNo()));
+ if (Objects.isNull(locCache)) {
+ return null;
+ }
+ BasAreasService basAreasService = SpringUtils.getBean(BasAreasService.class);
+ BasAreas basAreas = basAreasService.selectById(locCache.getAreaId());
+ if (Objects.isNull(basAreas)) {
+ return null;
+ }
+ if (basAreas.getAreaNo().equals("SO")) {
+ return "2";
+ } else if (basAreas.getAreaNo().equals("EO")) {
+ return "3";
+ } else if (basAreas.getAreaNo().equals("LK")) {
+ return "1";
+ } else {
+ return "4";
+ }
+ }
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
@@ -376,5 +457,7 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
-
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
}
--
Gitblit v1.9.1