From 0c60480362efdcffa0cbb3f6dd4272f43859adb1 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 01 四月 2025 15:05:15 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 418 ++++++++++------------------------------------------------
1 files changed, 76 insertions(+), 342 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 3dd03d4..4c1e5cd 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -56,8 +56,6 @@
@Transactional
public class MainServiceImpl {
- public static final long COMMAND_TIMEOUT = 5 * 1000;
-
@Autowired
private SlaveProperties slaveProperties;
@Autowired
@@ -77,14 +75,8 @@
@Autowired
private TaskWrkService taskWrkService;
@Autowired
- private ConfigService configService;
- @Autowired
private StaDescMapper staDescMapper;
- @Autowired
- private CommandInfoService commandInfoService;
- @Autowired
- private OpenServiceImpl openServiceImpl;
@Autowired
private StaDescService staDescService;
@@ -103,8 +95,6 @@
private String taskStatusFeedbackPath;
@Autowired
private CrnController crnController;
- @Autowired
- private SiteController siteController;
public void generateStoreWrkFile() throws IOException, InterruptedException {
@@ -176,6 +166,7 @@
TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(workNo));
if (taskWrk != null) {
taskWrk.setMemo(errMsg);//灏嗛敊璇爜瀛樺叆澶囨敞瀛楁杩涜灞曠ず
+ taskWrk.setModiTime(new Date());
taskWrkMapper.updateById(taskWrk);
}
continue;
@@ -322,7 +313,7 @@
.build()
.doPost();
JSONObject jsonObject1 = JSON.parseObject(response2);
- apiLogService.save("wcs娲惧彂搴撲綅涓嶄负绌轰笂鎶ms"
+ apiLogService.save("wcs娲惧彂搴撲綅==銆嬩笉涓虹┖銆�==涓婃姤wms"
,wmsUrl+taskStatusFeedbackPath
,null
,"127.0.0.1"
@@ -331,8 +322,8 @@
,true
);
}catch (Exception e){
- log.error("wcs娲惧彂搴撲綅涓嶄负绌轰笂鎶ms", getWmsDto.getWrkNo());
- throw new CoolException("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触锛屽紓甯镐俊鎭細"+e);
+ log.error("wcs娲惧彂搴撲綅==銆嬩笉涓虹┖銆�==涓婃姤wms", getWmsDto.getWrkNo());
+ throw new CoolException("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触,娲惧彂搴撲綅==銆嬩笉涓虹┖銆�==锛屽紓甯镐俊鎭細"+e);
}
}
@@ -367,6 +358,7 @@
TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(workNo));
if (taskWrk != null) {
taskWrk.setMemo(errMsg);//灏嗛敊璇爜瀛樺叆澶囨敞瀛楁杩涜灞曠ず
+ taskWrk.setModiTime(new Date());
taskWrkMapper.updateById(taskWrk);
}
}
@@ -407,16 +399,28 @@
continue;
}
log.info("涓嬪彂杈撻�佺嚎浠诲姟锛歵askWrk:"+JSON.toJSONString(taskWrk));
- R r = siteController.siteDetlUpdate(Integer.valueOf(taskWrk.getTargetPoint()), taskWrk.getWrkNo().shortValue(), (short) 0, "Y", false, false);
- JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(r));
- if (jsonObject.getInteger("code").equals(200)){
+// R r = siteController.siteDetlUpdate(Integer.valueOf(taskWrk.getTargetPoint()), taskWrk.getWrkNo().shortValue(), (short) 0, "Y", false, false);
+ staProtocol.setWorkNo(taskWrk.getWrkNo().shortValue());
+ staProtocol.setStaNo(staDesc.getCrnStn().shortValue());
+ boolean offer = false;
+ try{
+ offer = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
+ }catch (Exception e){
+ log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛氬紓甯�:"+e);
+ log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛氬紓甯�:offer:"+offer);
+ }
+// JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(r));
+ if (offer){
log.info("涓嬪彂杈撻�佺嚎浠诲姟鎴愬姛锛歵askWrk:"+JSON.toJSONString(taskWrk));
+ Date now = new Date();
taskWrk.setStatus(5);
taskWrk.setWrkSts(14);
+ taskWrk.setModiTime(now);
+ taskWrk.setCompleteTime(now);
taskWrkService.updateById(taskWrk);
}else {
log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛歵askWrk:"+JSON.toJSONString(taskWrk));
- log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛氬紓甯镐俊鎭�:"+JSON.toJSONString(r));
+// log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛氬紓甯镐俊鎭�:"+JSON.toJSONString(r));
}
}
}catch (Exception e){
@@ -443,6 +447,9 @@
continue;
}
+ // 搴撲綅绉昏浆
+ this.locToLoc(crn, crnProtocol);
+
// 鍙湁褰撳爢鍨涙満绌洪棽 骞朵笖 鏃犱换鍔℃椂鎵嶇户缁墽琛�
if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO
&& crnProtocol.getLoaded() == 0 && crnProtocol.getForkPos() == 0) {
@@ -467,8 +474,6 @@
}
}
}
- // 搴撲綅绉昏浆
- this.locToLoc(crn, crnProtocol);
}
}
@@ -519,15 +524,16 @@
continue;
}
- int workNo = commonService.getWorkNo(WorkNoType.PAKIN.type);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
- taskWrk.setWrkNo(workNo);//宸ヤ綔鍙�
+// int workNo = commonService.getWorkNo(WorkNoType.PAKIN.type);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
+// taskWrk.setWrkNo(workNo);//宸ヤ綔鍙�
+ Date now = new Date();
taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);//娲惧彂鐘舵��
- taskWrk.setAssignTime(new Date());//娲惧彂鏃堕棿
+// taskWrk.setAssignTime(now);//娲惧彂鏃堕棿
+ taskWrk.setExecuteTime(now);
taskWrk.setWrkSts(3);//宸ヤ綔鐘舵�� 3.鍚婅溅鍏ュ簱
taskWrk.setCrnNo(staDesc.getCrnNo());//鍫嗗灈鏈哄彿
- taskWrk.setModiTime(new Date());
+ taskWrk.setModiTime(now);
taskWrk.setModiUser(9988L);
- taskWrkService.updateById(taskWrk);
// //鍙栧嚭鍛戒护
// List<CommandInfo> commandInfos = commandInfoService.selectByTaskNo(taskWrk.getTaskNo());
@@ -578,6 +584,12 @@
throw new CoolException("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐�");
}else{
try{
+ taskWrkService.updateById(taskWrk);
+ }catch (Exception e){
+ log.error("淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
+ log.error("淇敼宸ヤ綔妗ｇ姸鎬� 2.璁惧涓婅蛋 => 3.鍚婅溅鍏ュ簱涓� 澶辫触锛侊紒锛屽紓甯革細"+e);
+ }
+ try{
HashMap<String, Object> headParam = new HashMap<>();
headParam.put("taskNo",taskWrk.getTaskNo());
headParam.put("status",taskWrk.getStatus());
@@ -600,9 +612,9 @@
,response
,true
);
- }catch (Exception e){
- log.error("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触", taskWrk);
- throw new CoolException("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触");
+ } catch (Exception e){
+ log.error("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触", JSON.toJSONString(taskWrk));
+// throw new CoolException("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触");
}
}
@@ -666,15 +678,6 @@
break;
}
-
- // 淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓�
- Date now = new Date();
- taskWrk.setWrkSts(12);
- taskWrk.setStatus(2);
- taskWrk.setModiTime(now);
- if (taskWrkMapper.updateById(taskWrk) == 0) {
- log.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
- }
CrnCommand command = new CrnCommand();
command.setCrnNo(taskWrk.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
command.setTaskNo(taskWrk.getWrkNo().shortValue()); // 宸ヤ綔鍙�
@@ -692,6 +695,20 @@
throw new CoolException("鍫嗗灈鏈哄懡浠ょ敓鎴愬け璐�");
}else{
try{
+ // 淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓�
+ Date now = new Date();
+ taskWrk.setWrkSts(12);
+ taskWrk.setStatus(2);
+ taskWrk.setModiTime(now);
+ taskWrk.setExecuteTime(now);
+ if (taskWrkMapper.updateById(taskWrk) == 0) {
+ log.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
+ }
+ }catch (Exception e){
+ log.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
+ log.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽紓甯革細"+e);
+ }
+ try{
HashMap<String, Object> headParam = new HashMap<>();
headParam.put("taskNo",taskWrk.getTaskNo());
headParam.put("status",taskWrk.getStatus());
@@ -706,7 +723,7 @@
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
- apiLogService.save("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms"
+ apiLogService.save("wcs娲惧彂鍑哄簱浠诲姟涓婃姤wms"
,wmsUrl+taskStatusFeedbackPath
,null
,"127.0.0.1"
@@ -715,60 +732,10 @@
,true
);
}catch (Exception e){
- log.error("wcs娲惧彂鍑哄簱浠诲姟涓婃姤wms澶辫触", taskWrk);
- throw new CoolException("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触");
+ log.error("wcs娲惧彂鍑哄簱浠诲姟涓婃姤wms澶辫触", JSON.toJSONString(taskWrk));
+// throw new CoolException("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触");
}
-
}
-
-// // 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞�
-// if (Utils.isDeepLoc(slaveProperties, taskWrk.getStartPoint())) {
-//
-// taskWrkMapper.selectPakOutIoType(taskWrk.getCrnNo());
-//
-// List<TaskWrk> taskWrks1 = taskWrkMapper.selectPakOutIoType(taskWrk.getCrnNo());
-// if (Cools.isEmpty(taskWrks1) && taskWrks1.size()!=0){
-// continue;
-// }
-// String shallowLocNo = Utils.getShallowLoc(slaveProperties, taskWrk.getStartPoint());
-// TaskWrk hallowLocNoTask = taskWrkMapper.selectByStartPoint(shallowLocNo);
-// if (!Cools.isEmpty(hallowLocNoTask)){
-// continue;
-// }
-// }
-//
-// //鍙栧嚭鍛戒护
-// List<CommandInfo> commandInfos = commandInfoService.selectByTaskNo(taskWrk.getTaskNo());
-// Integer commandStep = taskWrk.getCommandStep();
-// if (commandInfos.isEmpty()) {
-// continue;//鍛戒护绌�
-// }
-//
-// //鍒ゆ柇鏈鍛戒护鏄惁鎵ц
-// CommandInfo commandInfo2 = commandInfos.get(commandInfos.size() - 1);
-// if (commandInfo2.getCommandStatus() != CommandStatusType.CREATE.id) {
-// continue;//鎸囦护宸叉墽琛�
-// }
-//
-// CommandInfo commandInfo = commandInfos.get(commandStep);
-// CommandPackage commandPackage = JSON.parseObject(commandInfo.getCommand(), CommandPackage.class);//鍙栧嚭鍛戒护鎶ユ枃
-// CrnCommand crnCommand = JSON.parseObject(commandPackage.getCommand().toString(), CrnCommand.class);
-//
-// if (!MessageQueue.offer(SlaveType.Crn, taskWrk.getCrnNo(), new Task(2, crnCommand))) {
-// log.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", taskWrk.getCrnNo(), JSON.toJSON(crnCommand));
-// } else {
-//
-// //寮�濮嬭繍琛�
-// String response = CrnStartRunning(taskWrk);
-// JSONObject jsonObject = JSON.parseObject(response);
-// if (jsonObject.getInteger("code").equals(200)) {
-//
-// }else {
-// log.error("鍑哄簱寮�濮嬭繍琛岄�氳澶辫触,"+jsonObject.get("msg"));
-//
-// }
-// }
-
}
}
}
@@ -784,7 +751,8 @@
List<TaskWrk> taskWrks = taskWrkMapper.selectList(new EntityWrapper<TaskWrk>()
.eq("crn_no",slave.getId())
.eq("wrk_sts",11)
- .eq("io_type",3));
+ .eq("io_type",3)
+ .orderBy("io_pri",false));
for (TaskWrk taskWrk : taskWrks){
// 鍙屾繁搴撲綅涓旀祬搴撲綅鏈夎揣锛屽垯闇�鍏堝娴呭簱浣嶈繘琛屽簱浣嶇Щ杞�
@@ -840,6 +808,7 @@
taskWrk.setWrkSts(12);
taskWrk.setStatus(2);
taskWrk.setModiTime(now);
+ taskWrk.setExecuteTime(now);
if (taskWrkMapper.updateById(taskWrk) == 0) {
log.error("淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓� 澶辫触锛侊紒锛屽伐浣滃彿={}", taskWrk.getWrkNo());
}
@@ -867,8 +836,8 @@
,true
);
}catch (Exception e){
- log.error("wcs娲惧彂鍑哄簱浠诲姟涓婃姤wms澶辫触", taskWrk);
- throw new CoolException("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触");
+ log.error("wcs娲惧彂绉诲簱搴撲换鍔′笂鎶ms澶辫触", taskWrk);
+// throw new CoolException("wcs娲惧彂绉诲簱搴撲换鍔′笂鎶ms澶辫触");
}
}
@@ -881,54 +850,6 @@
/**
* 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
*/
-// public void storeFinished() {
-// for (CrnSlave crn : slaveProperties.getCrn()) {
-// // 鑾峰彇鍫嗗灈鏈轰俊鎭�
-// CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
-// CrnProtocol crnProtocol = crnThread.getCrnProtocol();
-// if (crnProtocol == null) { continue; }
-//
-// // 鐘舵�侊細绛夊緟纭 骞朵笖 浠诲姟瀹屾垚浣� = 1
-// if (crnProtocol.getTaskFinish() == 0 && crnProtocol.statusType == CrnStatusType.HANDLING_COMPLETED && crnProtocol.getTaskNo() != 0) {
-// //鑾峰彇鍏ュ簱寰呯‘璁ゅ伐浣滄。
-// TaskWrk taskWrk = taskWrkMapper.selectCrnNoInWorking(crn.getId(),crnProtocol.getTaskNo().intValue());
-// if (Cools.isEmpty(taskWrk)) {
-//// log.error("鍫嗗灈鏈哄浜庣瓑寰呯‘璁や笖浠诲姟瀹屾垚鐘舵�侊紝浣嗘湭鎵惧埌宸ヤ綔妗ｃ�傚爢鍨涙満鍙�={}锛屽伐浣滃彿={}", crn.getId(), crnProtocol.getTaskNo());
-// continue;
-// }
-//
-// //鑾峰彇鎸囦护ID
-// Integer commandId = crnProtocol.getCommandId();
-// 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)) {//淇敼鎴愬姛鍚庡浣嶅爢鍨涙満
-// // 鍫嗗灈鏈哄浣�
-// crnThread.setResetFlag(true);
-// }
-// }
-// }
-// }
-
- /**
- * 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
- */
public void storeFinished() throws InterruptedException {
for (CrnSlave crn : slaveProperties.getCrn()) {
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
@@ -937,7 +858,7 @@
if (crnProtocol == null) { continue; }
// 鐘舵�侊細绛夊緟纭 骞朵笖 浠诲姟瀹屾垚浣� = 1
- if (crnProtocol.getTaskFinish() == 0 && crnProtocol.statusType == CrnStatusType.HANDLING_COMPLETED && crnProtocol.getTaskNo() != 0) {
+ if (!Cools.isEmpty(crnProtocol.getTaskFinish()) && crnProtocol.getTaskFinish() == 0 && crnProtocol.statusType == CrnStatusType.WAITING && crnProtocol.getTaskNo() != 0) {
//鑾峰彇鍏ュ簱寰呯‘璁ゅ伐浣滄。
TaskWrk taskWrk = taskWrkMapper.selectCrnNoInWorking(crn.getId(),crnProtocol.getTaskNo().intValue());
if (Cools.isEmpty(taskWrk)&&crnProtocol.getTaskNo() !=999) {
@@ -948,6 +869,7 @@
//纭瀹屾垚淇″彿
CrnOperatorParam crnOperatorParam=new CrnOperatorParam();
crnOperatorParam.setCrnNo(crn.getId());
+ Date now = new Date();
crnController.crnTaskComplete(crnOperatorParam);
if(!Cools.isEmpty(taskWrk)){
@@ -958,7 +880,7 @@
LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
locMast.setLocSts("F");//F.鍦ㄥ簱
locMast.setBarcode(taskWrk.getBarcode());//鎵樼洏鐮�
- locMast.setModiTime(new Date());
+ locMast.setModiTime(now);
locMast.setModiUser(9999L);
locMastService.updateById(locMast);
}else if(taskWrk.getIoType()==2&&taskWrk.getWrkSts()==12){
@@ -968,7 +890,7 @@
LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
locMast.setLocSts("O");//O.绌哄簱浣�
locMast.setBarcode("");//鎵樼洏鐮�
- locMast.setModiTime(new Date());
+ locMast.setModiTime(now);
locMast.setModiUser(9999L);
locMastService.updateById(locMast);
}else if(taskWrk.getIoType()==3&&taskWrk.getWrkSts()==12){
@@ -978,17 +900,19 @@
LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
locMast.setLocSts("F");//F.鍦ㄥ簱
locMast.setBarcode(taskWrk.getBarcode());//鎵樼洏鐮�
- locMast.setModiTime(new Date());
+ locMast.setModiTime(now);
locMast.setModiUser(9999L);
locMastService.updateById(locMast);
LocMast locMast1 = locMastService.selectByLocNo(taskWrk.getStartPoint());
locMast1.setLocSts("O");//O.绌哄簱浣�
locMast1.setBarcode("");//鎵樼洏鐮�
- locMast1.setModiTime(new Date());
+ locMast1.setModiTime(now);
locMast1.setModiUser(9999L);
locMastService.updateById(locMast1);
}
+ taskWrk.setModiTime(now);
+ taskWrk.setCompleteTime(now);
taskWrkService.updateById(taskWrk);
@@ -1072,7 +996,7 @@
wrkMast.getSourceStaNo(), // 婧愮珯
wrkMast.getSourceLocNo(), // 婧愬簱浣�
wrkMast.getBarcode(), // 鏉＄爜
- (int) crnProtocol.getAlarm1(), // 寮傚父鐮�
+ (int) crnProtocol.getAlarm(), // 寮傚父鐮�
errName, // 寮傚父
1, // 寮傚父鎯呭喌
now, // 娣诲姞鏃堕棿
@@ -1087,7 +1011,7 @@
}
} else {
// 寮傚父淇
- if (crnProtocol.getAlarm1() == null || crnProtocol.getAlarm1() == 0) {
+ if (crnProtocol.getAlarm() == null || crnProtocol.getAlarm() == 0) {
latest.setEndTime(now);
latest.setUpdateTime(now);
latest.setStatus(2);
@@ -1100,7 +1024,7 @@
} else {
BasErrLog latest = basErrLogService.findLatest(crn.getId());
// 鏈夊紓甯�
- if (crnProtocol.getAlarm1() != null && crnProtocol.getAlarm() > 0) {
+ if (crnProtocol.getAlarm() != null && crnProtocol.getAlarm() > 0) {
// 璁板綍鏂板紓甯�
if (latest == null || (latest.getErrCode() != crnProtocol.getAlarm().intValue())) {
BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
@@ -1119,7 +1043,7 @@
null, // 婧愮珯
null, // 婧愬簱浣�
null, // 鏉＄爜
- (int)crnProtocol.getAlarm1(), // 寮傚父鐮�
+ (int)crnProtocol.getAlarm(), // 寮傚父鐮�
errName, // 寮傚父
1, // 寮傚父鎯呭喌
now, // 娣诲姞鏃堕棿
@@ -1150,199 +1074,6 @@
}
}
- //鑷姩娲惧彂浠诲姟
- public void autoDistribute() {
- Config config = configService.selectByCode("autoDistribute");
- if (config == null) {
- return;
- }
-
- if (config.getValue().equals("false")) {//鍒ゆ柇鏄惁寮�鍚嚜鍔ㄦ淳鍙戜换鍔�
- return;
- }
-
- for (TaskWrk taskWrk : taskWrkService.selectReceive()) {
-
- try {
- taskWrkService.distribute(taskWrk.getTaskNo(), 9527L);
- } catch (CoolException e) {
- log.info(e.getMessage());
- }
- }
- }
-
- //agv鍙栨斁璐т换鍔″畬鎴�
- public synchronized void autoCompleteAGV() {
- List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
- try{
- Thread.sleep(500);
- }catch (Exception e){
-
- }
-
- for (BasDevp basDevp:basDevps){
- DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
- StaProtocol staProtocol = devpThread.getStation().get(basDevp.getDevNo());
- if (staProtocol == null) {
- continue;
- } else {
- staProtocol = staProtocol.clone();
- }
- if (basDevp.getWrkNo()!=0){
- if (basDevp.getAgvTargetPick()!=0){//鍙栬揣
- staProtocol.setAgvTypeSign((short)0);
- staProtocol.setStaNo(basDevp.getDevNo().shortValue());
- MessageQueue.offer(SlaveType.Devp, 1, new Task(4, staProtocol));
- }
- boolean sign = true;
- if (basDevp.getAgvTargetPlace()!=0){
- sign = false;
- basDevp.setAgvTargetPlace(0);
- basDevpService.updateById(basDevp);
- staProtocol.setAgvTypeSign((short)3);//1
- staProtocol.setStaNo(basDevp.getDevNo().shortValue());
- MessageQueue.offer(SlaveType.Devp, 1, new Task(4, staProtocol));
- }
- }else {
- if (basDevp.getAgvTargetPlace()!=0){
- if (basDevp.getLoading().equals("Y")){
- staProtocol.setAgvTypeSign((short)1);
- staProtocol.setStaNo(basDevp.getDevNo().shortValue());
- MessageQueue.offer(SlaveType.Devp, 1, new Task(4, staProtocol));
- }else {
- log.error("AGV鏀捐揣瀹屾垚浣嗚緭閫佺嚎鏃犵墿锛屽浣嶄俊鍙� ===>> [staNo:{}] [basDevp:{}]", basDevp.getDevNo(), basDevp);
- basDevp.setAgvTargetPlace(0);
- basDevpService.updateById(basDevp);
- staProtocol.setAgvTypeSign((short)3);//1
- staProtocol.setStaNo(basDevp.getDevNo().shortValue());
- MessageQueue.offer(SlaveType.Devp, 1, new Task(4, staProtocol));
- }
-
- }
- if (basDevp.getAgvTargetPick()!=0){
- basDevp.setAgvTargetPick(0);
- basDevpService.updateById(basDevp);
- staProtocol.setAgvTypeSign((short)2);//0
- staProtocol.setStaNo(basDevp.getDevNo().shortValue());
- MessageQueue.offer(SlaveType.Devp, 1, new Task(4, staProtocol));
- }
- }
- }
- }
- public synchronized void autoCompleteTask() {
- List<TaskWrk> taskWrks = taskWrkMapper.selectWorkingTask();
- for (TaskWrk taskWrk : taskWrks) {
- //鑾峰彇鍛戒护闆嗗悎
- List<CommandInfo> commandInfos = commandInfoService.selectByTaskNo(taskWrk.getTaskNo());
- if (taskWrk.getCommandStep() < commandInfos.size()) {
- continue;//褰撳墠姝ュ簭娌℃湁鍒拌揪鏈�鍚庝竴鏉″懡浠�
- }
-
- //鍒ゆ柇鏈鍛戒护鏄惁鎵ц瀹屾垚
- CommandInfo commandInfo = commandInfos.get(commandInfos.size() - 1);
- if (commandInfo.getCommandStatus() != CommandStatusType.COMPLETE.id) {
- continue;//鎸囦护鏈畬鎴�
- }
-
- Date now = new Date();
- //鎸囦护宸插畬鎴愶紝鏇存柊浠诲姟
- if (taskWrk.getIoType() == 1) {
- //鍏ュ簱浠诲姟
- taskWrk.setWrkSts(4);//3.鍚婅溅鍏ュ簱涓� => 4.鍏ュ簱瀹屾垚
- //taskWrk.setStatus(TaskStatusType.COMPLETE.id);
- taskWrk.setModiTime(now);
- taskWrkService.updateById(taskWrk);
-
- //鏇存柊搴撲綅鐘舵��
- LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
- locMast.setLocSts("F");//F.鍦ㄥ簱
- locMast.setBarcode(taskWrk.getBarcode());//鎵樼洏鐮�
- locMast.setModiTime(now);
- locMast.setModiUser(9999L);
- locMastService.updateById(locMast);
- } else if (taskWrk.getIoType() == 2) {
- //鍑哄簱浠诲姟
- taskWrk.setWrkSts(14);//12.鍚婅溅鍑哄簱涓� => 14.鍑哄簱瀹屾垚
-// taskWrk.setStatus(TaskStatusType.COMPLETE.id);
- taskWrk.setModiTime(now);
- taskWrkService.updateById(taskWrk);
-
- //鏇存柊搴撲綅鐘舵��
- LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
- locMast.setLocSts("O");//O.绌哄簱浣�
- locMast.setBarcode("");//鎵樼洏鐮�
- locMast.setModiTime(now);
- locMast.setModiUser(9999L);
- locMastService.updateById(locMast);
- }
- }
- }
-
-
- public synchronized String CrnStartRunning(TaskWrk taskWrk){
- String tasktype = null;
- switch (taskWrk.getIoType()){
- case 1:
- tasktype= "RK";
- break;
- case 2:
- tasktype= "CK";
- break;
- case 3:
- tasktype= "YK";
- break;
- default:
- tasktype= "鏈煡";
- }
- Map<String, Object> map = new HashMap<>();
- map.put("x-api-key","7a15b5db-29b6-552c-8cff-0cfec3756da2");
- TaskOverToWms taskOverToWms = new TaskOverToWms();
- taskOverToWms.setFeedbackFrom("WCS"); //鏉ユ簮
- taskOverToWms.setWarehouseId("1688469798893297665"); //浠撳簱鏍囪瘑
- taskOverToWms.setTaskNo(taskWrk.getTaskNo()); //浠诲姟鍙�
- taskOverToWms.setTaskType(tasktype); // 浠诲姟绫诲瀷
- taskOverToWms.setContainerCode(taskWrk.getBarcode()); // 瀹瑰櫒缂栫爜
- if (taskWrk.getIoType() ==1 || taskWrk.getIoType() == 3){
- taskOverToWms.setEquipmentCode(String.valueOf(taskWrk.getCrnNo())); //璁惧缂栫爜
- taskOverToWms.setTargetLocationCode(taskWrk.getOriginTargetPoint()); //鐩爣搴撲綅
- }else if (taskWrk.getIoType() ==2){
- Map<Integer,String> map1 = new HashMap<>();
- map1.put(102,"J-1101");
- map1.put(106,"J-1103");
- map1.put(110,"J-1105");
- map1.put(114,"J-1107");
- map1.put(118,"J-1109");
- map1.put(122,"J-1111");
- map1.put(305,"H-1101");
- map1.put(405,"G-1101");
- taskOverToWms.setEquipmentCode(map1.get(taskWrk.getTargetPoint())); //璁惧缂栫爜
- taskOverToWms.setSourceLocationCode(taskWrk.getOriginStartPoint()); //婧愬簱浣�
- }
-
- taskOverToWms.setTaskStatus("executing"); //浠诲姟鐘舵��
- String response = null;
- try {
- response = new HttpHandler.Builder()
- .setHeaders(map)
- .setUri(wmsUrl)
- .setPath("wcsManager/wcsInterface/taskStatusFeedback")
- .setJson(JSON.toJSONString(taskOverToWms))
- .build()
- .doPost();
- }catch (Exception e){
- log.error("鍫嗗灈鏈轰换鍔″畬鎴愶紝璇锋眰wms浠诲姟瀹屾垚鎺ュ彛澶辫触");
- }
- apiLogService.save("鍫嗗灈鏈哄紑濮嬭繍琛�"
- ,wmsUrl+"wcsManager/wcsInterface/taskStatusFeedback"
- ,null
- ,"127.0.0.1"
- ,JSON.toJSONString(taskOverToWms)
- ,response
- ,true
- );
- return response;
- }
-
private TaskWrk createTask(GetWmsDto dto, String barcode){
String wcsLocNo = dto.getLocNo();
if(Cools.isEmpty(wcsLocNo)){
@@ -1355,6 +1086,9 @@
taskWrk.setWrkNo(workNo1);
taskWrk.setStatus(TaskStatusType.RECEIVE.id);//浠诲姟鐘舵�侊細鎺ユ敹
taskWrk.setCreateTime(now);
+ taskWrk.setAssignTime(now);
+ taskWrk.setModiTime(now);
+ taskWrk.setModiUser(5555L);
taskWrk.setIoType(1);//浠诲姟绫诲瀷
taskWrk.setIoPri(Cools.isEmpty(dto.getTaskPriority()) ? 300 : Integer.parseInt(dto.getTaskPriority()));//浼樺厛绾�
taskWrk.setBarcode(barcode);//鏉＄爜
--
Gitblit v1.9.1