From 18dd3559d3876ed8e97353cfc20d4c77eea5c8b1 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 21 三月 2024 13:30:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 63 ++++++++++++++++++++++++++-----
1 files changed, 53 insertions(+), 10 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 4347bc1..2b344d8 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -7,16 +7,11 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.TaskStatusType;
-import com.zy.asrs.entity.StaDesc;
-import com.zy.asrs.entity.TaskWrk;
-import com.zy.asrs.entity.ToWmsDTO;
+import com.zy.asrs.entity.*;
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.service.ApiLogService;
-import com.zy.asrs.service.OpenService;
-import com.zy.asrs.service.StaDescService;
-import com.zy.asrs.service.TaskWrkService;
+import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.common.utils.HttpHandler;
import com.zy.core.DevpThread;
@@ -48,6 +43,11 @@
@Autowired
private StaDescService staDescService;
+ @Autowired
+ private BasCrnpService basCrnpService;
+ @Autowired
+ private LocMastService locMastService;
+
@Value("${wms.url}")
@@ -61,6 +61,22 @@
@Override
public R taskCreate(taskCreateParam param) {
+ //绂佺敤鍫嗗灈鏈哄悗涓嶅彲涓嬪彂浠诲姟
+// BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", param.getCrn()));
+// if ((param.getIoType() == 3 || param.getIoType() == 1 ) && basCrnp.getInEnable().equals("N")){
+// throw new CoolException("鐢熸垚浠诲姟澶辫触锛屽爢鍨涙満涓嶅彲鐢�");
+// } else if (param.getIoType() == 2 && basCrnp.getOutEnable().equals("N")) {
+// throw new CoolException("鐢熸垚浠诲姟澶辫触锛屽爢鍨涙満涓嶅彲鐢�");
+// }
+ //绂佺敤搴撲綅鍚庝笉鍙笅鍙戝嚭搴撲换鍔�
+ if (param.getIoType() == 2){
+ String wcsLocNo = Utils.getWcsLocNo(param.getStartPoint());
+ LocMast locMast = locMastService.selectByLocNo(wcsLocNo);
+ if (locMast.getLocSts().equals("J")){
+ throw new CoolException("鐢熸垚鍑哄簱浠诲姟澶辫触锛屽簱浣嶈绂佺敤");
+ }
+ }
+
TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo());
if (taskWrk != null) {
throw new CoolException(param.getTaskNo() + "浠诲姟宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
@@ -150,7 +166,7 @@
,wmsUrl+"wcsManager/wcsInterface/inboundTaskApply"
,null
,"127.0.0.1"
- ,JSON.toJSONString(param)
+ ,JSON.toJSONString(toWmsDTO)
,response
,true
);
@@ -175,12 +191,19 @@
staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
.eq("crn_no",data.getTaskTunnel())
.eq("type_no",1)
- .lt("crn_stn",200));
+ .lt("stn_no",200));
+ }else if (param.getWharfSource().contains("H")){
+ staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+ .eq("crn_no",data.getTaskTunnel())
+ .eq("type_no",1)
+ .lt("stn_no",400)
+ .gt("stn_no",200));
}else {
staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
.eq("crn_no",data.getTaskTunnel())
.eq("type_no",1)
- .ge("crn_stn",200));
+ .lt("stn_no",500)
+ .ge("stn_no",400));
}
map1.put("taskTunnel", staDesc.getStnDesc());
//map1.put("taskTunnel", "J-1104");
@@ -270,6 +293,16 @@
if (Cools.isEmpty( map.get(inSta.getStaNo()))){
continue;
}
+ BasCrnp crnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", map.get(inSta.getStaNo())));
+ if (Cools.isEmpty(crnp)){
+ continue;
+ }
+ if (crnp.getInEnable().equals("N")){
+ continue;
+ }
+ if (crnp.getCrnSts()!=3){
+ continue;
+ }
list.add( map.get(inSta.getStaNo()));
}
}
@@ -306,6 +339,16 @@
if (Cools.isEmpty( map.get(inSta.getStaNo()))){
continue;
}
+ BasCrnp crnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", map.get(inSta.getStaNo())));
+ if (Cools.isEmpty(crnp)){
+ continue;
+ }
+ if (crnp.getInEnable().equals("N")){
+ continue;
+ }
+ if (crnp.getCrnSts()!=3){
+ continue;
+ }
list.add( map.get(inSta.getStaNo()));
}
}
--
Gitblit v1.9.1