From f1b1ba2ea0373b9b74884b57f5cc5d6408f12345 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期日, 17 十二月 2023 13:34:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 62 ++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 10 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 d641197..a67de9d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -89,6 +89,9 @@
@Autowired
private StaDescService staDescService;
+ @Autowired
+ private ApiLogService apiLogService;
+
@Value("${wms.url}")
private String wmsUrl;
@Value("${wms.movePath}")
@@ -109,11 +112,9 @@
staProtocol = staProtocol.clone();
}
Short workNo = staProtocol.getWorkNo();
- // 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
- if (staProtocol.isAutoing() && staProtocol.isLoading()
- && staProtocol.isInEnable()
- && !staProtocol.isEmptyMk() && (workNo >= 0)
- && staProtocol.isPakMk()) {
+ Short stano = staProtocol.getStaNo();
+
+
// 灏哄妫�娴嬪紓甯�
boolean back = false;
@@ -148,6 +149,12 @@
}
// 閫�鍥�
if (back) {
+ if (stano == inSta.getBackSta().shortValue()){
+ continue;
+ }
+ if (workNo == 0 && stano == 0){
+ continue;
+ }
// News.warn("鎵爜鍏ュ簱澶辫触锛寋}鍏ュ簱绔欏洜{}寮傚父锛屾墭鐩樺凡琚��鍥�", inSta.getStaNo(), errMsg);
staProtocol.setWorkNo(workNo);
staProtocol.setStaNo(inSta.getBackSta().shortValue());
@@ -161,6 +168,11 @@
}
continue;
}
+ // 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
+ if (staProtocol.isAutoing() && staProtocol.isLoading()
+ && staProtocol.isInEnable()
+ && !staProtocol.isEmptyMk() && (workNo >= 0)
+ && staProtocol.isPakMk()) {
// 鑾峰彇鏉＄爜鎵弿浠俊鎭�
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
if (barcodeThread == null) {
@@ -180,15 +192,18 @@
continue;
}
//StaDesc staDesc1 = staDescService.selectOne(new EntityWrapper<StaDesc>().eq("stn_no",inSta.getBackSta()));
- if (taskWrk.getTargetPoint() != null && taskWrk.getStartPoint() != null && taskWrk.getWrkNo() != null && taskWrk.getWrkNo().shortValue() != workNo){
+ if (taskWrk.getTargetPoint() != null && taskWrk.getStartPoint() != null){
+ if ( taskWrk.getWrkNo() != null && taskWrk.getWrkNo().shortValue() == workNo ){
+ continue;
+ }
//鑾峰彇鍫嗗灈鏈虹珯鐐�
StaDesc staDesc = new StaDesc();
if (devp.getId() <= 1){
staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
- .eq("crn_no", taskWrk.getCrnNo()).eq("type_no",1).lt("crn_stn", 200));
+ .eq("crn_no", taskWrk.getCrnNo()).eq("type_no",1).lt("stn_no", 200));
}else {
staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
- .eq("crn_no", taskWrk.getCrnNo()).eq("type_no",1).ge("crn_stn", 200));
+ .eq("crn_no", taskWrk.getCrnNo()).eq("type_no",1).lt("stn_no", 400).ge("stn_no", 250));
}
staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
staProtocol.setStaNo(staDesc.getCrnStn().shortValue());
@@ -214,6 +229,14 @@
log.error("wms閫氳澶辫触,"+e.getMessage());
continue;
}
+ apiLogService.save("wms璇锋眰鍏ュ簱璐т綅鎺ュ彛"
+ ,wmsUrl+"wcsManager/wcsInterface/inboundTaskApply"
+ ,null
+ ,"127.0.0.1"
+ ,JSON.toJSONString(toWmsDTO)
+ ,response
+ ,true
+ );
JSONObject jsonObject = JSON.parseObject(response);
if (jsonObject.getInteger("code").equals(200)) {
GetWmsDto getWmsDto = JSON.parseObject(jsonObject.get("data").toString(), GetWmsDto.class);
@@ -711,12 +734,23 @@
//鑾峰彇鎸囦护ID
Integer commandId = crnProtocol.getCommandId();
- CommandInfo commandInfo = commandInfoService.selectById(commandId);
+ CommandInfo commandInfo = new CommandInfo();
+ if (Cools.isEmpty(commandId)){
+ commandInfo = commandInfoService.selectOne(new EntityWrapper<CommandInfo>()
+ .eq("wrk_no",crnProtocol.getTaskNo())
+ .eq("device","Crn"));
+ }else {
+ commandInfo = commandInfoService.selectById(commandId);
+ }
+
+
if (commandInfo == null) {
//鎸囦护涓嶅瓨鍦�
continue;
}
-
+ if (commandInfo.getCommandStatus() == 3){
+ continue;
+ }
commandInfo.setCommandStatus(CommandStatusType.COMPLETE.id);//鎸囦护瀹屾垚
commandInfo.setCompleteTime(new Date());//鎸囦护瀹屾垚鏃堕棿
if (commandInfoService.updateById(commandInfo)) {//淇敼鎴愬姛鍚庡浣嶅爢鍨涙満
@@ -1014,6 +1048,14 @@
}catch (Exception e){
log.error("鍫嗗灈鏈轰换鍔″畬鎴愶紝璇锋眰wms浠诲姟瀹屾垚鎺ュ彛澶辫触");
}
+ apiLogService.save("鍫嗗灈鏈哄紑濮嬭繍琛�"
+ ,wmsUrl+"wcsManager/wcsInterface/taskStatusFeedback"
+ ,null
+ ,"127.0.0.1"
+ ,JSON.toJSONString(taskOverToWms)
+ ,response
+ ,true
+ );
return response;
}
--
Gitblit v1.9.1