From 12067f657bc3dc169a7a466e433374368e8daf73 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期日, 18 一月 2026 16:14:27 +0800
Subject: [PATCH] 越库订单逻辑调整
---
src/main/java/com/zy/asrs/entity/TaskLog.java | 95 +++++++----------------------------------------
1 files changed, 14 insertions(+), 81 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/TaskLog.java b/src/main/java/com/zy/asrs/entity/TaskLog.java
index cd3b222..941ba7f 100644
--- a/src/main/java/com/zy/asrs/entity/TaskLog.java
+++ b/src/main/java/com/zy/asrs/entity/TaskLog.java
@@ -2,6 +2,7 @@
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.*;
@@ -25,15 +26,18 @@
private Long id;
/**
+ * 浠诲姟绫诲瀷锛� agv , crn
+ */
+ @ApiModelProperty(value = "浠诲姟绫诲瀷锛� agv , crn")
+ @TableField("task_type")
+ private String taskType;
+
+ /**
* 宸ヤ綔鍙�
*/
@ApiModelProperty(value = "宸ヤ綔鍙�")
@TableField("wrk_no")
private Integer wrkNo;
-
- @ApiModelProperty(value = "")
- @TableField("log_id")
- private Long logId;
@ApiModelProperty(value = "")
@TableField("inv_wh")
@@ -55,7 +59,7 @@
*/
@ApiModelProperty(value = "宸ヤ綔鐘舵��")
@TableField("wrk_sts")
- private Integer wrkSts;
+ private Long wrkSts;
/**
* 鍏ュ嚭搴撶被鍨�
@@ -99,14 +103,14 @@
*/
@ApiModelProperty(value = "鐩爣绔�")
@TableField("sta_no")
- private Integer staNo;
+ private String staNo;
/**
* 婧愮珯
*/
@ApiModelProperty(value = "婧愮珯")
@TableField("source_sta_no")
- private Integer sourceStaNo;
+ private String sourceStaNo;
/**
* 婧愬簱浣�
@@ -336,68 +340,7 @@
public TaskLog() {
}
- public TaskLog(Long id, Integer wrkNo, Long logId, String invWh, Date ymd, String mk, Integer whsType, Integer wrkSts, Integer ioType, Integer crnNo, String sheetNo, Double ioPri, Date wrkDate, String locNo, Integer staNo, Integer sourceStaNo, String sourceLocNo, String locSts, String picking, String linkMis, String onlineYn, String updMk, String exitMk, Integer pltType, String emptyMk, Date ioTime, Integer ctnType, String packed, String oveMk, Double mtnType, String userNo, Date crnStrTime, Date crnEndTime, Date plcStrTime, Date crnPosTime, Double loadTime, Double expTime, Double refWrkno, Date refIotime, Long modiUser, Date modiTime, Long appeUser, Date appeTime, String pauseMk, Date errorTime, String errorMemo, Integer ctnKind, String manuType, String memoM, Double scWeight, String logMk, Date logErrTime, String logErrMemo, String barcode, String PdcType, String ctnNo, String fullPlt, String preHave, String takeNone, Long lineNumber) {
- this.id = id;
- this.wrkNo = wrkNo;
- this.logId = logId;
- this.invWh = invWh;
- this.ymd = ymd;
- this.mk = mk;
- this.whsType = whsType;
- this.wrkSts = wrkSts;
- this.ioType = ioType;
- this.crnNo = crnNo;
- this.sheetNo = sheetNo;
- this.ioPri = ioPri;
- this.wrkDate = wrkDate;
- this.locNo = locNo;
- this.staNo = staNo;
- this.sourceStaNo = sourceStaNo;
- this.sourceLocNo = sourceLocNo;
- this.locSts = locSts;
- this.picking = picking;
- this.linkMis = linkMis;
- this.onlineYn = onlineYn;
- this.updMk = updMk;
- this.exitMk = exitMk;
- this.pltType = pltType;
- this.emptyMk = emptyMk;
- this.ioTime = ioTime;
- this.ctnType = ctnType;
- this.packed = packed;
- this.oveMk = oveMk;
- this.mtnType = mtnType;
- this.userNo = userNo;
- this.crnStrTime = crnStrTime;
- this.crnEndTime = crnEndTime;
- this.plcStrTime = plcStrTime;
- this.crnPosTime = crnPosTime;
- this.loadTime = loadTime;
- this.expTime = expTime;
- this.refWrkno = refWrkno;
- this.refIotime = refIotime;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
- this.pauseMk = pauseMk;
- this.errorTime = errorTime;
- this.errorMemo = errorMemo;
- this.ctnKind = ctnKind;
- this.manuType = manuType;
- this.memoM = memoM;
- this.scWeight = scWeight;
- this.logMk = logMk;
- this.logErrTime = logErrTime;
- this.logErrMemo = logErrMemo;
- this.barcode = barcode;
- this.PdcType = PdcType;
- this.ctnNo = ctnNo;
- this.fullPlt = fullPlt;
- this.preHave = preHave;
- this.takeNone = takeNone;
- this.lineNumber = lineNumber;
- }
+
// TaskLog taskLog = new TaskLog(
// null, //
@@ -522,21 +465,11 @@
}
public String getStaNo$() {
- BasDevpService service = SpringUtils.getBean(BasDevpService.class);
- BasDevp basDevp = service.selectById(this.staNo);
- if (!Cools.isEmpty(basDevp)) {
- return String.valueOf(basDevp.getDevNo());
- }
- return null;
+ return this.staNo;
}
public String getSourceStaNo$() {
- BasDevpService service = SpringUtils.getBean(BasDevpService.class);
- BasDevp basDevp = service.selectById(this.sourceStaNo);
- if (!Cools.isEmpty(basDevp)) {
- return String.valueOf(basDevp.getDevNo());
- }
- return null;
+ return this.sourceStaNo;
}
public String getSourceLocNo$() {
--
Gitblit v1.9.1