From 3b73ea7b24c1281f4ad789a80359d77f8121da33 Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期三, 10 一月 2024 16:55:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/TaskLogScheduler.java | 47 +++++++++++++++++++++++++++++++++--------------
1 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index 18ebbee..5a61e26 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -4,10 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.zy.asrs.domain.enums.TaskStatusType;
-import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.CommandInfo;
-import com.zy.asrs.entity.StaDesc;
-import com.zy.asrs.entity.TaskWrk;
+import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.TaskOverToWms;
import com.zy.asrs.entity.param.TaskStatusFeedbackParam;
import com.zy.asrs.service.*;
@@ -20,6 +17,7 @@
import org.springframework.stereotype.Component;
import java.io.IOException;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -42,6 +40,8 @@
@Autowired
private StaDescService staDescService;
+ @Autowired
+ private LocMastService locMastService;
@Value("${wms.url}")
private String wmsUrl;
@@ -72,9 +72,28 @@
taskOverToWms.setSourceLocationCode(taskWrk.getOriginStartPoint()); //婧愬簱浣�
//鍒ゆ柇鎵樼洏鏄惁璧板埌鍑哄簱绔�
BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", taskWrk.getTargetPoint()));
- if (!basDevp.getWrkNo().equals(taskWrk.getWrkNo())){
+ if (!basDevp.getWrkNo().equals(taskWrk.getWrkNo()) || !basDevp.getOutEnable().equals("Y")){
continue;
}
+ } else if (taskWrk.getIoType() ==3) {
+ taskOverToWms.setEquipmentCode(String.valueOf(taskWrk.getCrnNo())); //璁惧缂栫爜
+ taskOverToWms.setTargetLocationCode(taskWrk.getOriginTargetPoint()); //鐩爣搴撲綅
+ Date now = new Date();
+ //鏇存柊搴撲綅鐘舵��
+ LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
+ locMast.setLocSts("O");//O.绌哄簱浣�
+ locMast.setBarcode("");//鎵樼洏鐮�
+ locMast.setModiTime(now);
+ locMast.setModiUser(9999L);
+ locMastService.updateById(locMast);
+
+ //鏇存柊搴撲綅鐘舵��
+ LocMast locMast2 = locMastService.selectByLocNo(taskWrk.getTargetPoint());
+ locMast2.setLocSts("F");//F.鍦ㄥ簱
+ locMast2.setBarcode(taskWrk.getBarcode());//鎵樼洏鐮�
+ locMast2.setModiTime(now);
+ locMast2.setModiUser(9999L);
+ locMastService.updateById(locMast2);
}
taskOverToWms.setTaskStatus("done"); //浠诲姟鐘舵��
@@ -90,18 +109,18 @@
}catch (Exception e){
continue;
}
- apiLogService.save("Wms浠诲姟瀹屾垚鎺ュ彛"
- ,wmsUrl+"/wcsManager/wcsInterface/taskStatusFeedback"
- ,null
- ,"127.0.0.1"
- ,JSON.toJSONString(taskOverToWms)
- ,response
- ,true
- );
+
JSONObject jsonObject = JSON.parseObject(response);
if (jsonObject.getInteger("code").equals(200)){
-
+ apiLogService.save("Wms浠诲姟瀹屾垚鎺ュ彛"
+ ,wmsUrl+"/wcsManager/wcsInterface/taskStatusFeedback"
+ ,null
+ ,"127.0.0.1"
+ ,JSON.toJSONString(taskOverToWms)
+ ,response
+ ,true
+ );
}else {
continue;
}
--
Gitblit v1.9.1