From fa35f658190d4d929591c5e93417373be0ded91e Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期一, 13 十月 2025 14:02:21 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/entity/BasArmMast.java | 5 +++--
src/main/java/com/zy/asrs/controller/OpenController.java | 3 +++
src/main/java/com/zy/asrs/entity/param/TaskArmReportParam.java | 1 +
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 2 +-
4 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 8c343cc..d69c327 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -249,6 +249,9 @@
if (Cools.isEmpty(param.getStaNo())) {
return R.error("鍒嗘嫞鐐逛綅[staNo]涓嶈兘涓虹┖");
}
+ if (Cools.isEmpty(param.getBindingTags())) {
+ return R.error("鍒嗘嫞缁戝畾绫诲埆[bindingTags]涓嶈兘涓虹┖");
+ }
openService.taskArmReport(param);
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/entity/BasArmMast.java b/src/main/java/com/zy/asrs/entity/BasArmMast.java
index 30667a0..7b852b6 100644
--- a/src/main/java/com/zy/asrs/entity/BasArmMast.java
+++ b/src/main/java/com/zy/asrs/entity/BasArmMast.java
@@ -56,7 +56,7 @@
*/
@ApiModelProperty(value= "缁戝畾鏍囪")
@TableField("binding_tags")
- private Integer bindingTags;
+ private Long bindingTags;
/**
* 浼樺厛绾�
@@ -128,10 +128,11 @@
this.upc = param.getUpc();
this.supplier = param.getSupplier();
this.createTime = param.getCreateTime();
+ this.bindingTags = param.getBindingTags();
this.sortingLine = Integer.parseInt(param.getStaNo());;
}
- public BasArmMast(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 BasArmMast(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;
diff --git a/src/main/java/com/zy/asrs/entity/param/TaskArmReportParam.java b/src/main/java/com/zy/asrs/entity/param/TaskArmReportParam.java
index c7aba57..316c9e8 100644
--- a/src/main/java/com/zy/asrs/entity/param/TaskArmReportParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/TaskArmReportParam.java
@@ -23,4 +23,5 @@
private Double ctns = 1.0;
//鏃堕棿鎴�
private Long createTime;
+ private Long bindingTags;//鍒嗘嫞缁戝畾绫诲埆
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 0eff044..fc65a33 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -620,7 +620,7 @@
if (Cools.isEmpty(basArmMastOld)){
basArmMastService.insert(basArmMast);
} else {
- throw new CoolException("鏈煡璇㈠埌鐩稿叧鏈烘鑷傛媶鐮佸灈浠诲姟锛侊紒锛�"+ JSON.toJSONString(param));
+ throw new CoolException("绛夊緟鍓嶈竟璐х墿鎶撳彇锛侊紒锛�"+ JSON.toJSONString(param));
}
}
--
Gitblit v1.9.1