From 34aa40fffdda9155e77a7991ca8c7691102bb0b8 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期日, 26 四月 2026 11:29:05 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/entity/TaskLog.java | 43 ++++++++++++++++++++++---------------------
1 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/TaskLog.java b/src/main/java/com/zy/asrs/entity/TaskLog.java
index 47d9f5c..0d4f55b 100644
--- a/src/main/java/com/zy/asrs/entity/TaskLog.java
+++ b/src/main/java/com/zy/asrs/entity/TaskLog.java
@@ -1,5 +1,6 @@
package com.zy.asrs.entity;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;import com.core.common.SpringUtils;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.entity.WrkMast;
@@ -146,14 +147,14 @@
*/
@ApiModelProperty(value= "鐩爣绔�")
@TableField("sta_no")
- private Integer staNo;
+ private String staNo;
/**
* 婧愮珯
*/
@ApiModelProperty(value= "婧愮珯")
@TableField("source_sta_no")
- private Integer sourceStaNo;
+ private String sourceStaNo;
/**
* 婧愬簱浣�
@@ -382,7 +383,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) {
+ 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,String staNo,String 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;
@@ -568,30 +569,30 @@
}
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;
+// BasDevpService service = SpringUtils.getBean(BasDevpService.class);
+// BasDevp basDevp = service.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", this.staNo));
+// if (!Cools.isEmpty(basDevp)){
+// return String.valueOf(basDevp.getDevNo());
+// }
+ 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;
+// BasDevpService service = SpringUtils.getBean(BasDevpService.class);
+// BasDevp basDevp = service.selectById(this.sourceStaNo);
+// if (!Cools.isEmpty(basDevp)){
+// return String.valueOf(basDevp.getDevNo());
+// }
+ return this.sourceStaNo;
}
public String getSourceLocNo$(){
- LocMastService service = SpringUtils.getBean(LocMastService.class);
- LocMast locMast = service.selectById(this.sourceLocNo);
- if (!Cools.isEmpty(locMast)){
- return String.valueOf(locMast.getLocNo());
- }
- return null;
+// LocMastService service = SpringUtils.getBean(LocMastService.class);
+// LocMast locMast = service.selectById(this.sourceLocNo);
+// if (!Cools.isEmpty(locMast)){
+// return String.valueOf(locMast.getLocNo());
+// }
+ return this.sourceLocNo;
}
public String getIoTime$(){
--
Gitblit v1.9.1