From aede5c5c19740a9903dfe2873caaacc10eebda66 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 28 四月 2025 12:37:07 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/OpenController.java | 272 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 195 insertions(+), 77 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 385906e..6548830 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -8,12 +8,20 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.CarryParam;
-import com.zy.asrs.entity.param.TaskOverParam;
-import com.zy.asrs.entity.param.WMSAndAGVInterfaceParam;
-import com.zy.asrs.entity.param.TaskCreateParam;
+import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.*;
+import com.zy.asrs.service.impl.BasCrnErrorServiceImpl;
+import com.zy.asrs.utils.Utils;
import com.zy.common.web.BaseController;
+import com.zy.core.CrnThread;
+import com.zy.core.cache.RgvStatusCache;
+import com.zy.core.cache.SlaveConnection;
+import com.zy.core.enums.SlaveType;
+import com.zy.core.model.CrnSlave;
+import com.zy.core.model.RgvSlave;
+import com.zy.core.model.protocol.CrnProtocol;
+import com.zy.core.model.protocol.RgvProtocol;
+import com.zy.core.properties.SlaveProperties;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -29,6 +37,8 @@
@RequestMapping("/open")
public class OpenController extends BaseController {
+ @Autowired
+ private SlaveProperties slaveProperties;
@Autowired
private OpenService openService;
@Autowired
@@ -47,6 +57,10 @@
private StaDescService staDescService;
@Autowired
private LocMastService locMastService;
+ @Autowired
+ private BasRgvErrService basRgvErrService;
+ @Autowired
+ private BasCrnErrorServiceImpl basCrnErrorService;
@Value("${wms.url}")
private String wmsUrl;
@@ -56,6 +70,7 @@
public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
add("ea1f0459efc02a79f046f982767939ae");
}};
+
//agv浠诲姟瀹屾垚
@PostMapping("/toAgvTaskOver")
@AppAuth(memo = "agv浠诲姟瀹屾垚鎺ュ彛")
@@ -78,38 +93,64 @@
//鍒涘缓浠诲姟
@PostMapping("/taskCreate")
+ @Transactional
public R taskCreate(@RequestHeader String appkey,
@RequestBody List<TaskCreateParam> param1,
HttpServletRequest request) {
auth(appkey, param1, request);
- for (TaskCreateParam param : param1
- ) {
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- if (Cools.isEmpty(param.getTaskNo())) {
- return R.error("浠诲姟鍙穂taskNo]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getIoType())) {
- return R.error("浠诲姟绫诲瀷[ioType]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getBarcode())) {
- return R.error("鏉＄爜[barcode]涓嶈兘涓虹┖");
- }
- String locNo=null;
- if(param.getIoType()==1){
- locNo=param.getTargetPoint();
- }else{
- locNo=param.getStartPoint();
- }
- LocMast locMast=locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("loc_sts","F")
- .eq("loc_no",locNo)
- .eq("barcode",param.getBarcode()));
- if(Cools.isEmpty(locMast)){
- return R.error("璇ュ簱浣嶄笉婊¤冻鍑哄簱鏉′欢"+param.getTargetPoint());
- }
- openService.taskCreate(param);
+ try{
+ List<TaskCreateParam> paramList = new ArrayList<>();
+ List<String> locNoList = new ArrayList<>();
+ for (TaskCreateParam param : param1) {
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getTaskNo())) {
+ return R.error("浠诲姟鍙穂taskNo]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getIoType())) {
+ return R.error("浠诲姟绫诲瀷[ioType]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getBarcode())) {
+ return R.error("鏉＄爜[barcode]涓嶈兘涓虹┖");
+ }
+ String locNo=null;
+ if(param.getIoType()==1){
+ locNo=param.getTargetPoint();
+ }else{
+ locNo=param.getStartPoint();
+ }
+ try{
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_no", locNo).ne("loc_sts","X"));
+ if (Cools.isEmpty(locMast)){
+ log.error("搴撲綅鍙蜂笉瀛樺湪"+locNo);
+ return R.error("搴撲綅鍙蜂笉瀛樺湪"+locNo).add("搴撲綅鍙蜂笉瀛樺湪"+locNo);
+ }
+ }catch (Exception e){
+ log.error("搴撲綅鍙锋娴嬬▼搴忓紓甯�==銆嬪紓甯镐俊鎭�"+e);
+ return R.error("搴撲綅鍙锋娴嬬▼搴忓紓甯�").add("搴撲綅鍙锋娴嬬▼搴忓紓甯�==銆嬪紓甯镐俊鎭�"+e);
+ }
+ LocMast locMast=locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_sts","F")
+ .eq("loc_no",locNo)
+ .eq("barcode",param.getBarcode()));
+ if(Cools.isEmpty(locMast)){
+ return R.error("璇ュ簱浣嶄笉婊¤冻鍑哄簱鏉′欢"+param.getTargetPoint());
+ }
+ if (!locNoList.contains(locMast.getLocNo())){
+ locNoList.add(locMast.getLocNo());
+ paramList.add(param);
+ }else {
+ return R.error("璇ュ簱浣嶄笉鑳藉悓鏃朵笅鍙戜袱绗斾换鍔�"+locMast.getLocNo());
+ }
+ }
+ for (TaskCreateParam param : paramList){
+ openService.taskCreate(param);
+ }
+ }catch (Exception e){
+ log.error("浠诲姟涓嬪彂寮傚父"+e);
+ return R.error();
}
return R.ok();
}
@@ -127,43 +168,43 @@
return R.ok().add(taskWrk);
}
- //鍙栨斁璐х敵璇�
- @PostMapping("/pick/and/place/v1")
- @AppAuth(memo = "agv鍙栨斁璐х敵璇�")
- public R getAgvPickAndPlaceV1(@RequestHeader String appkey,
- @RequestBody TaskOverParam param,
- HttpServletRequest request){
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- if (Cools.isEmpty(param.getStaNo())){
- return R.error("鐮佸ご[staNo]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getType())){
- return R.error("绫诲瀷[type]涓嶈兘涓虹┖");
- }
- return openService.getAgvPickAndPlaceV1(param);
- }
+// //鍙栨斁璐х敵璇�
+// @PostMapping("/pick/and/place/v1")
+// @AppAuth(memo = "agv鍙栨斁璐х敵璇�")
+// public R getAgvPickAndPlaceV1(@RequestHeader String appkey,
+// @RequestBody TaskOverParam param,
+// HttpServletRequest request){
+// auth(appkey, param, request);
+// if (Cools.isEmpty(param)) {
+// return R.parse(BaseRes.PARAM);
+// }
+// if (Cools.isEmpty(param.getStaNo())){
+// return R.error("鐮佸ご[staNo]涓嶈兘涓虹┖");
+// }
+// if (Cools.isEmpty(param.getType())){
+// return R.error("绫诲瀷[type]涓嶈兘涓虹┖");
+// }
+// return openService.getAgvPickAndPlaceV1(param);
+// }
- //鍙栨斁璐у畬鎴愬弽棣�
- @PostMapping("/pick/and/place/v2")
- @AppAuth(memo = "agv鍙栨斁璐у畬鎴愬弽棣�")
- public R getAgvPickAndPlaceV2(@RequestHeader String appkey,
- @RequestBody TaskOverParam param,
- HttpServletRequest request){
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- if (Cools.isEmpty(param.getStaNo())){
- return R.error("鐮佸ご[staNo]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getType())){
- return R.error("绫诲瀷[type]涓嶈兘涓虹┖");
- }
- return openService.getAgvPickAndPlaceV2(param);
- }
+// //鍙栨斁璐у畬鎴愬弽棣�
+// @PostMapping("/pick/and/place/v2")
+// @AppAuth(memo = "agv鍙栨斁璐у畬鎴愬弽棣�")
+// public R getAgvPickAndPlaceV2(@RequestHeader String appkey,
+// @RequestBody TaskOverParam param,
+// HttpServletRequest request){
+// auth(appkey, param, request);
+// if (Cools.isEmpty(param)) {
+// return R.parse(BaseRes.PARAM);
+// }
+// if (Cools.isEmpty(param.getStaNo())){
+// return R.error("鐮佸ご[staNo]涓嶈兘涓虹┖");
+// }
+// if (Cools.isEmpty(param.getType())){
+// return R.error("绫诲瀷[type]涓嶈兘涓虹┖");
+// }
+// return openService.getAgvPickAndPlaceV2(param);
+// }
//鏌ヨ浠诲姟鎸囦护闆嗗悎
@GetMapping("/queryTaskCommand")
@@ -287,13 +328,16 @@
//浠诲姟涓嬪彂鎺ュ彛
@PostMapping("/outboundTaskSend")
+// @PostMapping("/taskCreate")
+// @AppAuth(memo = "浠诲姟涓嬪彂鎺ュ彛")
@Transactional
public R outboundTaskSend(@RequestHeader String appkey,
- @RequestBody List<CarryParam> params,
+ @RequestBody List<CarryParam> params,//涓埅涓嬪彂 1锛氬嚭搴擄紝2锛氱Щ搴� 3锛氬叆搴�
HttpServletRequest request) {
- //auth(appkey, params, request);
- List<WMSAndAGVInterfaceParam> params1 =new ArrayList<>();
+ auth(appkey, params, request);
+// List<WMSAndAGVInterfaceParam> params1 =new ArrayList<>();
for (CarryParam param:params){
+ param.updateIoTyoe(param.getIoType());//涓埅涓嬪彂 1锛氬嚭搴擄紝2锛氱Щ搴� 3锛氬叆搴� ====杞崲涓�====> 1锛氬叆搴擄紝2锛氬嚭搴擄紝3锛氱Щ搴�
if (Cools.isEmpty(param)){
return R.error("鍙傛暟涓虹┖锛�");
@@ -324,7 +368,18 @@
R r = null;
- if(param.getIoType() == 2){
+ if(param.getIoType() == 1){
+ //鍏ュ簱浠诲姟鍒涘缓
+ StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+ .eq("type_no",1)
+ .eq("crn_no",locMast.getCrnNo())
+ .eq("stn_no",param.getStartPoint()));
+ if(Cools.isEmpty(staDesc)){
+ return R.error("鍏ュ簱璺姴涓嶅瓨鍦�");
+ }
+ r = openService.taskCreate(new TaskCreateParam(param,staDesc.getCrnNo()));
+
+ }else if(param.getIoType() == 2){
//鍑哄簱浠诲姟鍒涘缓
StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
.eq("type_no",2)
@@ -335,6 +390,13 @@
}
r = openService.taskCreate(new TaskCreateParam(param,staDesc.getCrnNo()));
}else if (param.getIoType() == 3){
+ LocMast locMast2 = locMastService.selectByLocNo(param.getTargetPoint());
+ if(Cools.isEmpty(locMast2)){
+ return R.error("鐩爣搴撲綅鏃犳硶鎵惧埌");
+ }
+ if (!locMast2.getCrnNo().equals(locMast.getCrnNo())){
+ return R.error("璧峰搴撲綅涓庣洰鏍囧簱浣嶄笉鍐嶅悓涓�宸烽亾");
+ }
//绉诲簱浠诲姟鍒涘缓
r = openService.taskCreate(new TaskCreateParam(param,locMast.getCrnNo()));
}
@@ -356,9 +418,10 @@
//浠诲姟鍙栨秷鎺ュ彛
@PostMapping("/taskCancel")
public R taskCancel(@RequestHeader String appkey,
- @RequestBody WMSAndAGVInterfaceParam param,
+ @RequestBody WMSAndAGVInterfaceParam param,//涓埅涓嬪彂 1锛氬嚭搴擄紝2锛氱Щ搴� 3锛氬叆搴� 1锛氬彇娑� 2 瀹屾垚
HttpServletRequest request) {
auth(appkey, param, request);
+// param.updateTaskStatus(param.getTaskStatus());
if (Cools.isEmpty(param)){
return R.error("鍙傛暟涓虹┖锛�");
} else if (Cools.isEmpty(param.getTaskNo())){
@@ -417,12 +480,67 @@
List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
List<Object> list = new ArrayList<>();
for (BasDevp basDevp:basDevps){
- list.add(basDevp);
+ BasDevpWmsParam basDevpWmsParam = new BasDevpWmsParam();
+ basDevpWmsParam.setDevNo(basDevp.getDevNo());
+ basDevpWmsParam.setWrkNo(basDevp.getWrkNo().longValue());
+ basDevpWmsParam.setAutoing(basDevp.getAutoing());
+ basDevpWmsParam.setLoading(basDevp.getLoading());
+ basDevpWmsParam.setInEnable(basDevp.getInEnable());
+ basDevpWmsParam.setOutEnable(basDevp.getOutEnable());
+ basDevpWmsParam.setDevErr(basDevp.getStaErr().longValue());
+ basDevpWmsParam.setDevErrM(basDevpWmsParam.getDevErr$());
+ list.add(basDevpWmsParam);
}
- List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
- for (BasCrnp basCrnp:basCrnps){
- list.add(basCrnp);
+ List<BasCrnpWmsParam> basCrnpWmsParamList = new ArrayList<>();
+ for (CrnSlave crn : slaveProperties.getCrn()) {
+ // 鑾峰彇鍫嗗灈鏈轰俊鎭�
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ if (crnProtocol == null) { continue; }
+ BasCrnp basCrnp = basCrnpService.selectById(crn.getId());
+ if (basCrnp == null) {
+ log.error("{}鍙峰爢鍨涙満灏氭湭鍦ㄦ暟鎹簱杩涜缁存姢锛�", crn.getId());
+ continue;
+ }
+ BasCrnpWmsParam basCrnpWmsParam = new BasCrnpWmsParam();
+ basCrnpWmsParam.sync(basCrnp);
+
+ basCrnpWmsParam.setCrnNoH(crnProtocol.getLaneNo());
+ basCrnpWmsParamList.add(basCrnpWmsParam);
+
+ try{
+ BasCrnError basCrnError = basCrnErrorService.selectById(basCrnp.getCrnErr());
+ basCrnpWmsParam.setCrnErrM(basCrnError.getErrName());
+ } catch (Exception e){
+ basCrnpWmsParam.setCrnErrM("鏈煡寮傚父");
+ }
+
+ list.add(basCrnpWmsParam);
}
+ for (RgvSlave rgvSlave : slaveProperties.getRgv()) {
+ RgvProtocol rgvStatus = RgvStatusCache.getRgvStatus(rgvSlave.getId());
+ if (Cools.isEmpty(rgvStatus)){
+ continue;
+ }
+ BasRgvWmsParam basRgvWmsParam = new BasRgvWmsParam();
+ basRgvWmsParam.setWrkNo(rgvStatus.getTaskNo());
+ basRgvWmsParam.setCrnSts(rgvStatus.getStatus().intValue());
+ basRgvWmsParam.setStatusType(rgvStatus.getStatusType().desc);
+ basRgvWmsParam.setSteNo(rgvSlave.getId());
+ basRgvWmsParam.setSteErr(rgvStatus.getAlarm().longValue());
+ try{
+ BasRgvErr basRgvErr = basRgvErrService.selectById(rgvStatus.getAlarm().longValue());
+
+ basRgvWmsParam.setSteErrM(basRgvErr.getErrName());
+ } catch (Exception e){
+ basRgvWmsParam.setSteErrM("鏈煡寮傚父");
+ }
+ list.add(basRgvWmsParam);
+ }
+// List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
+// for (BasCrnp basCrnp:basCrnps){
+// list.add(basCrnp);
+// }
return R.ok(list);
}
--
Gitblit v1.9.1