From 5026865596b57287aefc72acdc9938bc0d93dbec Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期日, 22 六月 2025 15:35:27 +0800
Subject: [PATCH] #改造
---
src/main/java/com/zy/asrs/entity/BasRgvOpt.java | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasRgvOpt.java b/src/main/java/com/zy/asrs/entity/BasRgvOpt.java
index c362734..57cc786 100644
--- a/src/main/java/com/zy/asrs/entity/BasRgvOpt.java
+++ b/src/main/java/com/zy/asrs/entity/BasRgvOpt.java
@@ -31,7 +31,7 @@
* ID
*/
@ApiModelProperty(value= "ID")
- @TableId(value = "id", type = IdType.INPUT)
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
@@ -153,30 +153,45 @@
private String memo;
public BasRgvOpt() {}
- public BasRgvOpt(RgvProtocol rgvProtocol, RgvCommand command) {
+ public BasRgvOpt(Integer taskNo,int rgvNo,int rgvPoi, RgvCommand command) {
Date now = new Date();
- this.wrkNo1 = rgvProtocol.getTaskNo1().intValue();
- this.rgvNo = rgvProtocol.getRgvNo();
+ this.wrkNo1 = taskNo;
+ this.rgvNo = rgvNo;
this.sendTime = now;
- this.mode = command.getTaskModeType1().name();
+ this.mode = command.getTaskModeTypeString();
+ this.sourceRow = rgvPoi;//灏忚溅褰撳墠浣嶇疆
this.sourceSta = command.getSourceStaNo1().intValue();
this.posSta = command.getDestinationStaNo1().intValue();
this.updateTime = now;
this.updateBy = 9999L;
this.memo = "浠诲姟涓嬪彂鑷姩鐢熸垚鎸囦护鏃ュ織";
}
- public BasRgvOpt(RgvProtocol rgvProtocol, Long command) {
+ public BasRgvOpt(Integer taskNo,int rgvNo,int rgvPoi, Long command) {
Date now = new Date();
- this.wrkNo1 = rgvProtocol.getTaskNo1().intValue();
- this.rgvNo = rgvProtocol.getRgvNo();
+ this.wrkNo1 = taskNo;
+ this.rgvNo = rgvNo;
this.sendTime = now;
- this.mode = "鍙栨斁璐�";
- this.sourceSta = rgvProtocol.getRgvPosI();
+ this.mode = "婕父";
+ this.sourceRow = rgvPoi;//灏忚溅褰撳墠浣嶇疆
+ this.sourceSta = rgvPoi;
this.posSta = command.intValue();
this.updateTime = now;
this.updateBy = 9999L;
this.memo = "婕父浠诲姟瑙﹀彂";
}
+ public BasRgvOpt(Integer taskNo,int rgvNo,int rgvPoi) {
+ Date now = new Date();
+ this.wrkNo1 = taskNo;
+ this.rgvNo = rgvNo;
+ this.sendTime = now;
+ this.mode = "浠诲姟鍙栨秷";
+ this.sourceRow = rgvPoi;//灏忚溅褰撳墠浣嶇疆
+ this.sourceSta = rgvPoi;
+ this.posSta = 0;
+ this.updateTime = now;
+ this.updateBy = 9999L;
+ this.memo = "浠诲姟鍙栨秷";
+ }
public BasRgvOpt(Integer wrkNo1,Integer wrkNo2,Integer rgvNo,Date sendTime,String mode,Integer sourceRow,Integer sourceBay,Integer sourceLev,Integer sourceSta,Integer posRow,Integer posBay,Integer posLev,Integer posSta,Integer response,Date updateTime,Long updateBy,String memo) {
this.wrkNo1 = wrkNo1;
--
Gitblit v1.9.1