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 | 340 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 303 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index 8db6c7c..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")
@@ -32,6 +38,18 @@
@ApiModelProperty(value= "宸ヤ綔鏃堕棿")
@TableField("io_time")
private Date ioTime;
+
+ /**
+ * 鏁伴噺
+ */
+ @ApiModelProperty(value= "鏁伴噺")
+ private Double anfme;
+
+ /**
+ * 鎵樼洏鏉＄爜
+ */
+ @ApiModelProperty(value= "鎵樼洏鏉＄爜")
+ private String zpallet;
/**
* 鐗╂枡
@@ -58,72 +76,174 @@
@TableField("order_no")
private String orderNo;
+ @ApiModelProperty(value= "鍗曟嵁id")
+ @TableField("order_id")
+ private Long orderId;
/**
- * 浠撳簱鍙�
+ * 瑙勬牸
*/
@ApiModelProperty(value= "瑙勬牸")
- private String lgnum;
+ private String specs;
/**
- * 浠撳簱鍙�
+ * 鍨嬪彿
*/
@ApiModelProperty(value= "鍨嬪彿")
- private String type;
+ private String model;
/**
- * 浠撳簱鍙�
+ * 棰滆壊
*/
- @ApiModelProperty(value= "鏉＄爜")
+ @ApiModelProperty(value= "棰滆壊")
private String color;
/**
- * 浠撳簱鍙�
+ * 鍝佺墝
*/
- @ApiModelProperty(value= "鎵瑰彿")
- private String supplier;
-
- /**
- * 浠撳簱鍙�
- */
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
- private String warehouse;
-
- /**
- * 浠撳簱鍙�
- */
- @ApiModelProperty(value= "鍝侀」鏁�")
+ @ApiModelProperty(value= "鍝佺墝")
private String brand;
-
- /**
- * 鏁伴噺
- */
- @ApiModelProperty(value= "鏁伴噺")
- private Double anfme;
/**
* 鍗曚綅
*/
@ApiModelProperty(value= "鍗曚綅")
- private String altme;
+ private String unit;
/**
- * 鎵樼洏鏉＄爜
+ * 鍗曚环
*/
- @ApiModelProperty(value= "鎵樼洏鏉＄爜")
- private String zpallet;
+ @ApiModelProperty(value= "鍗曚环")
+ private Double price;
/**
- * 鐢ㄦ埛ID
+ * sku
*/
- @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
- private String bname;
+ @ApiModelProperty(value= "sku")
+ private String sku;
/**
- * 澶囨敞
+ * 鍗曚綅閲�
*/
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
+ @ApiModelProperty(value= "鍗曚綅閲�")
+ private Double units;
+
+ /**
+ * 鏉＄爜
+ */
+ @ApiModelProperty(value= "鏉＄爜")
+ private String barcode;
+
+ /**
+ * 浜у湴
+ */
+ @ApiModelProperty(value= "浜у湴")
+ private String origin;
+
+ /**
+ * 鍘傚
+ */
+ @ApiModelProperty(value= "鍘傚")
+ private String manu;
+
+ /**
+ * 鐢熶骇鏃ユ湡
+ */
+ @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+ @TableField("manu_date")
+ private String manuDate;
+
+ /**
+ * 鍝侀」鏁�
+ */
+ @ApiModelProperty(value= "鍝侀」鏁�")
+ @TableField("item_num")
+ private String itemNum;
+
+ /**
+ * 瀹夊叏搴撳瓨閲�
+ */
+ @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
+ @TableField("safe_qty")
+ private Double safeQty;
+
+ /**
+ * 閲嶉噺
+ */
+ @ApiModelProperty(value= "閲嶉噺")
+ private Double weight;
+
+ /**
+ * 闀垮害
+ */
+ @ApiModelProperty(value= "闀垮害")
+ @TableField("man_length")
+ private Double manLength;
+
+ /**
+ * 浣撶Н
+ */
+ @ApiModelProperty(value= "浣撶Н")
+ private Double volume;
+
+ /**
+ * 涓夋柟缂栫爜
+ */
+ @ApiModelProperty(value= "涓夋柟缂栫爜")
+ @TableField("three_code")
+ private String threeCode;
+
+ /**
+ * 渚涘簲鍟�
+ */
+ @ApiModelProperty(value= "渚涘簲鍟�")
+ private String supp;
+
+ /**
+ * 渚涘簲鍟嗙紪鐮�
+ */
+ @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+ @TableField("supp_code")
+ private String suppCode;
+
+ /**
+ * 鏄惁鎵规 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
+ @TableField("be_batch")
+ private Integer beBatch;
+
+ /**
+ * 淇濊川鏈�
+ */
+ @ApiModelProperty(value= "淇濊川鏈�")
+ @TableField("dead_time")
+ private String deadTime;
+
+ /**
+ * 棰勮澶╂暟
+ */
+ @ApiModelProperty(value= "棰勮澶╂暟")
+ @TableField("dead_warn")
+ private Integer deadWarn;
+
+ /**
+ * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗
+ */
+ @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ private Integer source;
+
+ /**
+ * 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ private Integer inspect;
+
+ /**
+ * 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ private Integer danger;
/**
* 淇敼浜哄憳
@@ -153,12 +273,156 @@
@TableField("appe_time")
private Date appeTime;
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ /**
+ * 澶囩敤1
+ */
+ @ApiModelProperty(value= "澶囩敤1")
+ private String standby1 = "";
+
+ /**
+ * 澶囩敤2
+ */
+ @ApiModelProperty(value= "澶囩敤2")
+ private String standby2 = "";
+
+ /**
+ * 澶囩敤3
+ */
+ @ApiModelProperty(value= "澶囩敤3")
+ 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)){
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
+ }
+
+ public String getBeBatch$(){
+ if (null == this.beBatch){ return null; }
+ switch (this.beBatch){
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.beBatch);
+ }
+ }
+
+ public String getSource$(){
+ if (null == this.source){ return null; }
+ switch (this.source){
+ case 1:
+ return "鍒堕��";
+ case 2:
+ return "閲囪喘";
+ case 3:
+ return "澶栧崗";
+ default:
+ return String.valueOf(this.source);
+ }
+ }
+
+ public String getInspect$(){
+ if (null == this.inspect){ return null; }
+ switch (this.inspect){
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.inspect);
+ }
+ }
+
+ public String getDanger$(){
+ if (null == this.danger){ return null; }
+ switch (this.danger){
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.danger);
+ }
}
public String getModiUser$(){
@@ -193,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