From 4d0d1312f0782bd90cec598a6125fe503b0fd727 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期三, 15 十月 2025 09:28:30 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/BasArmMast.java | 7 +++++++
src/main/resources/mapper/BasArmMastMapper.xml | 1 +
src/main/java/com/zy/asrs/entity/BasArmMastLog.java | 31 +++++++++++++++++++++++++++++--
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 8 +++-----
src/main/resources/mapper/BasArmMastLogMapper.xml | 1 +
5 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasArmMast.java b/src/main/java/com/zy/asrs/entity/BasArmMast.java
index 7b852b6..217acfc 100644
--- a/src/main/java/com/zy/asrs/entity/BasArmMast.java
+++ b/src/main/java/com/zy/asrs/entity/BasArmMast.java
@@ -119,6 +119,13 @@
@TableField("arm_msg")
private String armMsg;
+ /**
+ * 寮傚父淇℃伅
+ */
+ @ApiModelProperty(value= "鏉＄爜")
+ @TableField("barcode")
+ private String barcode;
+
public BasArmMast() {}
public BasArmMast(TaskArmReportParam param) {
this.orderNo = param.getOrderNo();
diff --git a/src/main/java/com/zy/asrs/entity/BasArmMastLog.java b/src/main/java/com/zy/asrs/entity/BasArmMastLog.java
index 93cc457..6e47448 100644
--- a/src/main/java/com/zy/asrs/entity/BasArmMastLog.java
+++ b/src/main/java/com/zy/asrs/entity/BasArmMastLog.java
@@ -55,7 +55,7 @@
*/
@ApiModelProperty(value= "缁戝畾鏍囪")
@TableField("binding_tags")
- private Integer bindingTags;
+ private Long bindingTags;
/**
* 浼樺厛绾�
@@ -118,9 +118,16 @@
@TableField("arm_msg")
private String armMsg;
+ /**
+ * 寮傚父淇℃伅
+ */
+ @ApiModelProperty(value= "鏉＄爜")
+ @TableField("barcode")
+ private String barcode;
+
public BasArmMastLog() {}
- public BasArmMastLog(Integer armNo,Integer armDirection,Integer staNo,Integer sortingLine,Integer bindingTags,Long priority,Integer status,String matnr,String sku,String po,String upc,String supplier,String orderNo,Integer ctns,Long createTime,Long armError,String armMsg) {
+ public BasArmMastLog(Integer armNo,Integer armDirection,Integer staNo,Integer sortingLine,Long bindingTags,Long priority,Integer status,String matnr,String sku,String po,String upc,String supplier,String orderNo,Integer ctns,Long createTime,Long armError,String armMsg) {
this.armNo = armNo;
this.armDirection = armDirection;
this.staNo = staNo;
@@ -139,6 +146,26 @@
this.armError = armError;
this.armMsg = armMsg;
}
+ public BasArmMastLog(BasArmMast basArmMast) {
+ this.armNo = basArmMast.getArmNo();
+ this.armDirection = basArmMast.getArmDirection();
+ this.staNo = basArmMast.getStaNo();
+ this.sortingLine = basArmMast.getSortingLine();
+ this.bindingTags = basArmMast.getBindingTags();
+ this.priority = basArmMast.getPriority();
+ this.status = basArmMast.getStatus();
+ this.matnr = basArmMast.getMatnr();
+ this.sku = basArmMast.getSku();
+ this.po = basArmMast.getPo();
+ this.upc = basArmMast.getUpc();
+ this.supplier = basArmMast.getSupplier();
+ this.orderNo = basArmMast.getOrderNo();
+ this.ctns = basArmMast.getCtns();
+ this.createTime = basArmMast.getCreateTime();
+ this.armError = basArmMast.getArmError();
+ this.armMsg = basArmMast.getArmMsg();
+ this.barcode = basArmMast.getBarcode();
+ }
// BasArmMastLog basArmMastLog = new BasArmMastLog(
// null, // 鏈烘鑷傜紪鍙穂闈炵┖]
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index 36893e3..c2a8a9a 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -2,10 +2,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
-import com.zy.asrs.entity.BasArmMast;
-import com.zy.asrs.entity.WaitPakin;
-import com.zy.asrs.entity.WrkDetl;
-import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
@@ -133,8 +130,9 @@
@Transactional
public ReturnT<String> startArm(BasArmMast basArmMast) {
try {
+ BasArmMastLog basArmMastLog = new BasArmMastLog(basArmMast);
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
- if (!basArmMastLogService.save(basArmMast.getId())) {
+ if (!basArmMastLogService.insert(basArmMastLog)) {
exceptionHandle("淇濆瓨ARM宸ヤ綔鍘嗗彶妗id={0}]澶辫触", basArmMast.getId());
}
// 鍒犻櫎宸ヤ綔涓绘。
diff --git a/src/main/resources/mapper/BasArmMastLogMapper.xml b/src/main/resources/mapper/BasArmMastLogMapper.xml
index f025919..006a8fa 100644
--- a/src/main/resources/mapper/BasArmMastLogMapper.xml
+++ b/src/main/resources/mapper/BasArmMastLogMapper.xml
@@ -22,6 +22,7 @@
<result column="create_time" property="createTime" />
<result column="arm_error" property="armError" />
<result column="arm_msg" property="armMsg" />
+ <result column="barcode" property="barcode" />
</resultMap>
diff --git a/src/main/resources/mapper/BasArmMastMapper.xml b/src/main/resources/mapper/BasArmMastMapper.xml
index f5a0524..de5b6f0 100644
--- a/src/main/resources/mapper/BasArmMastMapper.xml
+++ b/src/main/resources/mapper/BasArmMastMapper.xml
@@ -22,6 +22,7 @@
<result column="create_time" property="createTime" />
<result column="arm_error" property="armError" />
<result column="arm_msg" property="armMsg" />
+ <result column="barcode" property="barcode" />
</resultMap>
--
Gitblit v1.9.1