From a31e08e80e08275389f786c1b6959d09a3b74588 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期五, 26 十二月 2025 08:50:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yhfzasrs' into yhfzasrs

---
 src/main/java/com/zy/asrs/entity/TaskLog.java |   67 ---------------------------------
 1 files changed, 1 insertions(+), 66 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/TaskLog.java b/src/main/java/com/zy/asrs/entity/TaskLog.java
index 519e8aa..2f69175 100644
--- a/src/main/java/com/zy/asrs/entity/TaskLog.java
+++ b/src/main/java/com/zy/asrs/entity/TaskLog.java
@@ -32,10 +32,6 @@
     private Integer wrkNo;
 
     @ApiModelProperty(value = "")
-    @TableField("log_id")
-    private Long logId;
-
-    @ApiModelProperty(value = "")
     @TableField("inv_wh")
     private String invWh;
 
@@ -336,68 +332,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 = Long.valueOf(wrkSts);
-        this.ioType = ioType;
-        this.crnNo = crnNo;
-        this.sheetNo = sheetNo;
-        this.ioPri = ioPri;
-        this.wrkDate = wrkDate;
-        this.locNo = locNo;
-        this.staNo = String.valueOf(staNo);
-        this.sourceStaNo = String.valueOf(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,    // 

--
Gitblit v1.9.1