From 72ce003daa99f4e36466e7fc146e6c14bfc6438f Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 27 十月 2025 08:32:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 2fa2bdb..f086254 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -3557,6 +3557,7 @@
WrkMastSta wrkMastSta1 = wrkMastStaMapper.selectByWorkSta(1, (int) rgvProtocol.getRgvNo());
if(wrkMastSta1 != null && wrkMastSta2 != null){
rgvThread.setPakMk(false); //灏忚溅鍙屽伐浣嶉攣瀹�
+
}
// if(basRgv.getPakToCrn().equals("0")){
// rgvRunWrkToCrn(rgv, rgvProtocol,mark); //鑻ュ皬杞﹀彇鍒颁竴涓帴椹充换鍔★紝绗簩涓伐浣嶅彧鑳藉彇鎺ラ┏浠诲姟
@@ -4538,9 +4539,20 @@
.eq("status", 2)
.eq("binding_tags", basArmMast.getBindingTags())
);
+
if (binding_tags<2){
- armTaskAssignmentCallApiLogSave(staProtocol, "鏉＄爜鏁版嵁宸插瓨鍦紒锛侊紒", staProtocol.getSiteId()+"鐮佸灈浣嶇疆锛屾潯鐮佹暟鎹鍦ㄨ嚜鍔ㄧ粍鎵�===>>" + barcode, false);
- continue;
+ BasArmMast basArmMastOne = basArmMastService.selectOne(
+ new EntityWrapper<BasArmMast>()
+ .eq("status", 2)
+ .eq("binding_tags", basArmMast.getBindingTags())
+ );
+ Double anfmeSignOne = basArmMastService.selectBasArmMastSignValue(basArmMastOne.getOrderNo(), basArmMastOne.getSku(),basArmMastOne.getBindingTags());
+
+ if (anfmeSignOne>1D){
+ armTaskAssignmentCallApiLogSave(staProtocol, "鏉＄爜鏁版嵁宸插瓨鍦紒锛侊紒", staProtocol.getSiteId()+"鐮佸灈浣嶇疆锛屾潯鐮佹暟鎹鍦ㄨ嚜鍔ㄧ粍鎵�===>>" + barcode, false);
+ continue;
+ }
+
}
}
OrderDetlValueResultUtil orderDetlValueResultUtil = basArmMastService.selectOrderDetlValue(basArmMast.getOrderNo(), basArmMast.getSku());
@@ -4620,7 +4632,7 @@
try{
List<BasAgvMast> basAgvMastList = basAgvMastService.selectList(new EntityWrapper<BasAgvMast>().eq("status", 0));
for (BasAgvMast basAgvMast : basAgvMastList) {
- if (basAgvMast.getStatus()!=0 && basAgvMast.getIoType()!=0){//0==銆婣GV搴撲綅==銆嬭緭閫佺嚎绔欑偣
+ if (basAgvMast.getStatus()!=0 || basAgvMast.getIoType()!=0){//0==銆婣GV搴撲綅==銆嬭緭閫佺嚎绔欑偣
continue;
}
try{
@@ -4638,7 +4650,7 @@
AgvTaskAssignmentParam agvTaskAssignmentParam = new AgvTaskAssignmentParam(basAgvMast);
//浠诲姟涓嬪彂
- ReturnT<String> result = new PostMesDataUtils().postMesData("AGV浠诲姟涓嬪彂", AgvConstant.AGV_URL, AgvConstant.AGV_ADAPTOR, agvTaskAssignmentParam);
+ ReturnT<String> result = new PostMesDataUtils().postMesDataAgv("AGV浠诲姟涓嬪彂", AgvConstant.AGV_URL, AgvConstant.AGV_ADAPTOR, agvTaskAssignmentParam);
if (result.getCode()==200){
basAgvMast.setStatus(1);
basAgvMastService.updateById(basAgvMast);
@@ -4662,14 +4674,14 @@
try{
List<BasAgvMast> basAgvMastList = basAgvMastService.selectList(new EntityWrapper<BasAgvMast>().eq("status", 0));
for (BasAgvMast basAgvMast : basAgvMastList) {
- if (basAgvMast.getStatus()!=0 && basAgvMast.getIoType()!=1){//1==銆婣GV搴撲綅==銆婣GV搴撲綅
+ if (basAgvMast.getStatus()!=0 || basAgvMast.getIoType()!=1){//1==銆婣GV搴撲綅==銆婣GV搴撲綅
continue;
}
try{
- AgvTaskAssignmentParam agvTaskAssignmentParam = new AgvTaskAssignmentParam();
+ AgvTaskAssignmentParam agvTaskAssignmentParam = new AgvTaskAssignmentParam(basAgvMast);
//浠诲姟涓嬪彂
- ReturnT<String> result = new PostMesDataUtils().postMesData("AGV浠诲姟涓嬪彂", AgvConstant.AGV_URL, AgvConstant.AGV_ADAPTOR, agvTaskAssignmentParam);
+ ReturnT<String> result = new PostMesDataUtils().postMesDataAgv("AGV浠诲姟涓嬪彂", AgvConstant.AGV_URL, AgvConstant.AGV_ADAPTOR, agvTaskAssignmentParam);
if (result.getCode()==200){
basAgvMast.setStatus(1);
basAgvMastService.updateById(basAgvMast);
@@ -4693,7 +4705,7 @@
try{
List<BasAgvMast> basAgvMastList = basAgvMastService.selectList(new EntityWrapper<BasAgvMast>().eq("status", 0));
for (BasAgvMast basAgvMast : basAgvMastList) {
- if (basAgvMast.getStatus()!=0 && basAgvMast.getIoType()!=2){//2==銆嬭緭閫佺嚎绔欑偣==銆婣GV搴撲綅
+ if (basAgvMast.getStatus()!=0 || basAgvMast.getIoType()!=2){//2==銆嬭緭閫佺嚎绔欑偣==銆婣GV搴撲綅
continue;
}
try{
@@ -4708,10 +4720,10 @@
if (!Cools.isEmpty(staProtocol.getWorkNo()) && staProtocol.getWorkNo().equals(basAgvMast.getTaskNo())){
- AgvTaskAssignmentParam agvTaskAssignmentParam = new AgvTaskAssignmentParam();
+ AgvTaskAssignmentParam agvTaskAssignmentParam = new AgvTaskAssignmentParam(basAgvMast);
//浠诲姟涓嬪彂
- ReturnT<String> result = new PostMesDataUtils().postMesData("AGV浠诲姟涓嬪彂", AgvConstant.AGV_URL, AgvConstant.AGV_ADAPTOR, agvTaskAssignmentParam);
+ ReturnT<String> result = new PostMesDataUtils().postMesDataAgv("AGV浠诲姟涓嬪彂", AgvConstant.AGV_URL, AgvConstant.AGV_ADAPTOR, agvTaskAssignmentParam);
if (result.getCode()==200){
basAgvMast.setStatus(1);
basAgvMastService.updateById(basAgvMast);
@@ -4735,7 +4747,7 @@
try{
List<BasAgvMast> basAgvMastList = basAgvMastService.selectList(new EntityWrapper<BasAgvMast>().eq("status", 0));
for (BasAgvMast basAgvMast : basAgvMastList) {
- if (basAgvMast.getStatus()!=0 && basAgvMast.getIoType()!=3){//3==銆嬭緭閫佺嚎绔欑偣==銆嬭緭閫佺嚎绔欑偣
+ if (basAgvMast.getStatus()!=0 || basAgvMast.getIoType()!=3){//3==銆嬭緭閫佺嚎绔欑偣==銆嬭緭閫佺嚎绔欑偣
continue;
}
try{
@@ -4757,10 +4769,10 @@
if (!Cools.isEmpty(staProtocol.getWorkNo()) && staProtocol.getWorkNo().equals(basAgvMast.getTaskNo())){
- AgvTaskAssignmentParam agvTaskAssignmentParam = new AgvTaskAssignmentParam();
+ AgvTaskAssignmentParam agvTaskAssignmentParam = new AgvTaskAssignmentParam(basAgvMast);
//浠诲姟涓嬪彂
- ReturnT<String> result = new PostMesDataUtils().postMesData("AGV浠诲姟涓嬪彂", AgvConstant.AGV_URL, AgvConstant.AGV_ADAPTOR, agvTaskAssignmentParam);
+ ReturnT<String> result = new PostMesDataUtils().postMesDataAgv("AGV浠诲姟涓嬪彂", AgvConstant.AGV_URL, AgvConstant.AGV_ADAPTOR, agvTaskAssignmentParam);
if (result.getCode()==200){
basAgvMast.setStatus(1);
basAgvMastService.updateById(basAgvMast);
--
Gitblit v1.9.1