From e82ebf78cdc2b0c0579f8bc00f9956ce4f76bffc Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 28 四月 2025 13:11:57 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 98 +++++++++++++++++++++++++++---------------------
1 files changed, 55 insertions(+), 43 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 b688f7d..6170fef 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -79,6 +79,17 @@
taskWrk.setWrkNo(workNo1);
taskWrk.setStatus(TaskStatusType.RECEIVE.id);//浠诲姟鐘舵�侊細鎺ユ敹
taskWrk.setCreateTime(now);
+ taskWrk.setModiTime(now);
+ taskWrk.setAssignTime(new Date());
+ taskWrk.setModiUser(6666L);
+ try{
+ if (param.getIoType()>1){
+ if (Utils.locNoRowBoolean(locMast.getRow1())){
+ param.setTaskPriority(11);
+ }
+ }
+ }catch (Exception e){
+ }
taskWrk.setIoType(param.getIoType());//浠诲姟绫诲瀷
taskWrk.setIoPri(param.getTaskPriority());//浼樺厛绾�
taskWrk.setBarcode(param.getBarcode());//鏉＄爜
@@ -86,8 +97,9 @@
if(param.getIoType() == 1){
taskWrk.setWrkSts(1);
if (!Cools.isEmpty(param.getTargetPoint())) {
- taskWrk.setTargetPoint(Utils.getWcsLocNo(param.getTargetPoint()));//缁堢偣
- taskWrk.setOriginTargetPoint(param.getTargetPoint());
+// taskWrk.setTargetPoint(Utils.getWcsLocNo(param.getTargetPoint()));//缁堢偣 杞崲涓�
+ taskWrk.setTargetPoint(param.getTargetPoint());//缁堢偣
+ taskWrk.setOriginTargetPoint(param.getStartPoint());
}
} else if (param.getIoType() == 2) {
@@ -218,12 +230,12 @@
} else {
staProtocol = staProtocol.clone();
}
- Short workNo = staProtocol.getWorkNo();
+ Integer workNo = staProtocol.getWorkNo();
if (wharfCode1.contains(param.getWharfCode())){
- if (!staProtocol.isLoading() && !staProtocol.isCar() && staProtocol.getWorkNo() >0){
+ if (!staProtocol.isLoading() && staProtocol.getWorkNo() >0){
//AGV鍑哄簱瀹屾垚浠ュ悗
- staProtocol.setWorkNo((short) 0);
- staProtocol.setStaNo((short)0);
+ staProtocol.setWorkNo( 0);
+ staProtocol.setStaNo(0);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
if (result) {
@@ -235,10 +247,10 @@
for (DevpSlave.Sta inSta : devp.getInSta()) {
if (inSta.getBackSta().equals(staDesc.getStnNo())){
- if (staProtocol.isLoading() && !staProtocol.isCar() && workNo == 0){
+ if (staProtocol.isLoading() && workNo == 0){
//AGV鍏ュ簱瀹屾垚浠ュ悗
- staProtocol.setWorkNo((short) 9999);
- staProtocol.setStaNo(inSta.getStaNo().shortValue());
+ staProtocol.setWorkNo(9999);
+ staProtocol.setStaNo(inSta.getStaNo());
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
if (result) {
@@ -254,39 +266,39 @@
}
- @Override
- public R getAgvPickAndPlaceV1(TaskOverParam param) {
- BasDevp basDevp = basDevpService.selectById(param.getStaNo());
- if (Cools.isEmpty(basDevp)){
- return R.error("绔欑偣鍙锋湁璇�"+param.getStaNo());
- }
- if (param.getType()==0 && basDevp.getAgvStartPick()==1){
- return R.ok();
- }else if (param.getType()==1 && basDevp.getAgvStartPlace()==1){
- return R.ok();
- }else {
- return R.error();
- }
- }
+// @Override
+// public R getAgvPickAndPlaceV1(TaskOverParam param) {
+// BasDevp basDevp = basDevpService.selectById(param.getStaNo());
+// if (Cools.isEmpty(basDevp)){
+// return R.error("绔欑偣鍙锋湁璇�"+param.getStaNo());
+// }
+// if (param.getType()==0 && basDevp.getAgvStartPick()==1){
+// return R.ok();
+// }else if (param.getType()==1 && basDevp.getAgvStartPlace()==1){
+// return R.ok();
+// }else {
+// return R.error("涓嶅厑璁�");
+// }
+// }
- @Override
- public R getAgvPickAndPlaceV2(TaskOverParam param) {
- BasDevp basDevp = basDevpService.selectById(param.getStaNo());
- if (Cools.isEmpty(basDevp)){
- return R.error("绔欑偣鍙锋湁璇�"+param.getStaNo());
- }
- if (param.getType()==0){
- basDevp.setAgvTargetPick(1);
- basDevpService.updateById(basDevp);
- return R.ok();
- }else if (param.getType()==1){
- basDevp.setAgvTargetPlace(1);
- basDevpService.updateById(basDevp);
- return R.ok();
- }else {
- return R.error("璇锋眰绫诲瀷寮傚父"+param.getType());
- }
- }
+// @Override
+// public R getAgvPickAndPlaceV2(TaskOverParam param) {
+// BasDevp basDevp = basDevpService.selectById(param.getStaNo());
+// if (Cools.isEmpty(basDevp)){
+// return R.error("绔欑偣鍙锋湁璇�"+param.getStaNo());
+// }
+// if (param.getType()==0){
+// basDevp.setAgvTargetPick(1);
+// basDevpService.updateById(basDevp);
+// return R.ok();
+// }else if (param.getType()==1){
+// basDevp.setAgvTargetPlace(1);
+// basDevpService.updateById(basDevp);
+// return R.ok();
+// }else {
+// return R.error("璇锋眰绫诲瀷寮傚父"+param.getType());
+// }
+// }
public List<Integer> getInEnableRoadway(){
int[] roadway = null;
@@ -311,7 +323,7 @@
} else {
staProtocol = staProtocol.clone();
}
- Short workNo = staProtocol.getWorkNo();
+ Integer workNo = staProtocol.getWorkNo();
if (workNo == 0 && !staProtocol.isLoading()){
if (Cools.isEmpty( map.get(inSta.getStaNo()))){
continue;
@@ -347,7 +359,7 @@
} else {
staProtocol = staProtocol.clone();
}
- Short workNo = staProtocol.getWorkNo();
+ Integer workNo = staProtocol.getWorkNo();
if (workNo == 0 && !staProtocol.isLoading()){
if (Cools.isEmpty( map.get(inSta.getStaNo()))){
continue;
--
Gitblit v1.9.1