From 53ca017d46403700cabc775fc4dbd89f8ebdef78 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期六, 13 十二月 2025 13:35:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
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 368cdfc..0ae85bc 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -34,6 +34,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
* Created by vincent on 2022/4/9
@@ -773,7 +774,7 @@
if (Cools.isEmpty(basArmMast)){
throw new CoolException("鏈煡璇㈠埌鐩稿叧鏈烘鑷傛媶鐮佸灈浠诲姟锛侊紒锛�"+ JSON.toJSONString(param));
}
- basArmMastService.updateArmMastStatus(param.getArm_no(),basArmMast.getSortingLine(),basArmMast.getStaNo(),1,3);
+// basArmMastService.updateArmMastStatus(param.getArm_no(),basArmMast.getSortingLine(),basArmMast.getStaNo(),1,3);
basArmMastService.updateArmMastStatus(param.getArm_no(),basArmMast.getSortingLine(),basArmMast.getStaNo(),2,3);
}
@@ -797,6 +798,22 @@
if (!Cools.isEmpty(basArmMast)){
basArmMastService.updateArmMastStatus(param.getArm_no(),basArmMast.getSortingLine(),basArmMast.getStaNo(), 5,6);
}
+ }
+
+ @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
@@ -839,11 +856,15 @@
if (ts == null) {
throw new CoolException("timestamp 鐢熸垚澶辫触");
}
+
+ String barcode = String.valueOf(ts);
+ if (barcode.length() > 16) {
+ barcode = barcode.substring(0, 16);
+ }
+ basAgvMast.setBarcode(barcode);
+
String locNo = null;
String staNo = null;
-
- basAgvMast.setBarcode(Long.toString(ts));
-
basAgvMast.setTaskNo(commonService.getWorkNo(0));
basAgvMast.setSourceStaNo(param.getSourceStaNo());
basAgvMast.setStaNo(param.getStaNo());
@@ -872,7 +893,7 @@
basAgvMastService.insert(basAgvMast);
bindCtnrAndBinParam bindParam = new bindCtnrAndBinParam();
- bindParam.setBarcode(Long.toString(ts));
+ bindParam.setBarcode(basAgvMast.getBarcode());
bindParam.setIndBind("1");
bindParam.setFloorNo(basAgvMast.getFloorNo());
bindParam.setLocNo(locNo);
@@ -1046,7 +1067,11 @@
}
return false;
}else {
- if (basAgvMast.getIoType()==0 && (basAgvMast.getSourceStaNo()==2033 || basAgvMast.getStaNo()==4003)){
+ if (basAgvMast != null
+ && basAgvMast.getIoType() != null
+ && (basAgvMast.getIoType() == 0)
+ && (Objects.equals(basAgvMast.getSourceStaNo(), 2033) || Objects.equals(basAgvMast.getStaNo(), 2034)
+ || Objects.equals(basAgvMast.getStaNo(), 4003)|| Objects.equals(basAgvMast.getSourceStaNo(), 4006))){
AgvBindCtnrAndBinTwoParam agvBindCtnrAndBinTwoParam = new AgvBindCtnrAndBinTwoParam();
agvBindCtnrAndBinTwoParam.setReqCode(String.valueOf(snowflakeIdWorker.nextId()));
agvBindCtnrAndBinTwoParam.setPodcode(basAgvMast.getBarcode());
--
Gitblit v1.9.1