From bd3f1b6d3b0dd7429b6f3974f88e0890a401d968 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期五, 12 十二月 2025 11:55:50 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 1 +
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 16 ++++++++++++++++
src/main/java/com/zy/asrs/service/OpenService.java | 1 +
3 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 4fddbba..e369e5e 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -402,6 +402,7 @@
return R.error("鍗曟嵁缂栧彿[order_id]浠� "+sign_arm_sku+" 涓� "+sign_arm_order+" 浣滀负鎷嗗垎鏍囪鎷嗗垎澶辫触锛侊紒锛�");
}
if (param.getArm_no()>4){
+ openService.taskArmOrderResult(param);
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index 5b9467a..a7429de 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -57,5 +57,6 @@
boolean agvApplicationPassedTheGrating(ArmAgvGratingParam param);
boolean agvApplicationPassedTheGrating(AgvGoTheArnParam param);
boolean agvBindAndBin(String taskNo);
+ boolean taskArmOrderResult(OrderArmEndParam param);
}
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 32ee656..031a7b4 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -802,6 +802,22 @@
@Override
@Transactional
+ public boolean taskArmOrderResult(OrderArmEndParam param){
+ if(param.getDone_num() == 0){
+ if(basArmMastService.delete(new EntityWrapper<BasArmMast>().eq("arm_no",param.getArm_no())
+ .eq("status",1))){
+ return true;
+ }
+ }
+ if(param.getDone_num() == 1){
+ return true;
+ }
+ log.error("鏈壘鍒板搴斾换鍔�"+ param);
+ return false;
+ }
+
+ @Override
+ @Transactional
public boolean TaskArmWorkOrderSign(OrderArmEndParam param) {
BasArmMastSign basArmMastSignNew = basArmMastSignService.selectOne(
new EntityWrapper<BasArmMastSign>()
--
Gitblit v1.9.1