From accd3d0e177b9c2e6c4504d33a7d05adda0f8700 Mon Sep 17 00:00:00 2001
From: taisheng <taisheng@qq.com>
Date: 星期六, 10 五月 2025 13:38:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 85 +++++++++++++++++++++++++++++-------------
1 files changed, 58 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index e9a44f2..3c2815c 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -11,6 +11,8 @@
import com.zy.asrs.entity.CommandInfo;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.TaskWrk;
+import com.zy.asrs.entity.TaskWrkLog;
+import com.zy.asrs.entity.param.NotifyDto;
import com.zy.asrs.entity.param.TaskOverToWms;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.CommandInfoService;
@@ -289,33 +291,34 @@
taskWrk.setModiUser(9999L);//鎿嶄綔鍛�
}
String response="";
- try{
- HashMap<String, Object> headParam = new HashMap<>();
- headParam.put("TaskNo",taskWrk.getTaskNo());
- headParam.put("Result",0);
-// headParam.put("reportTime",new Date());
-
- log.info("wcs鎵嬪姩鍙栨秷浠诲姟涓婃姤wm={}", taskWrk);
- response = new HttpHandler.Builder()
- // .setHeaders(headParam)
- .setUri(wmsUrl)
- .setPath(TaskExecCallback)
- .setJson(JSON.toJSONString(headParam))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- apiLogService.save("wcs鎵嬪姩鍙栨秷浠诲姟涓婃姤wms"
- ,wmsUrl+TaskExecCallback
- ,null
- ,"127.0.0.1"
- ,JSON.toJSONString(headParam)
- ,response
- ,true
- );
- }catch (Exception e){
- log.error("wcs鎵嬪姩鍙栨秷浠诲姟涓婃姤wms澶辫触={},杩斿洖鍊�={}", taskWrk,response);
-// throw new CoolException(e);
- }
+// try{
+// HashMap<String, Object> headParam = new HashMap<>();
+// headParam.put("TaskNo",taskWrk.getTaskNo());
+// headParam.put("Result",0);
+//// headParam.put("reportTime",new Date());
+//
+// log.info("wcs鎵嬪姩鍙栨秷浠诲姟涓婃姤wm={}", taskWrk);
+// response = new HttpHandler.Builder()
+// // .setHeaders(headParam)
+// .setUri(wmsUrl)
+// .setPath(TaskExecCallback)
+// .setJson(JSON.toJSONString(headParam))
+// .build()
+// .doPost();
+// JSONObject jsonObject = JSON.parseObject(response);
+// apiLogService.save("wcs鎵嬪姩鍙栨秷浠诲姟涓婃姤wms"
+// ,wmsUrl+TaskExecCallback
+// ,null
+// ,"127.0.0.1"
+// ,JSON.toJSONString(headParam)
+// ,response
+// ,true
+// );
+// }catch (Exception e){
+// log.error("wcs鎵嬪姩鍙栨秷浠诲姟涓婃姤wms澶辫触={},杩斿洖鍊�={}", taskWrk,response);
+//// throw new CoolException(e);
+// }
+ taskWrk.setWrkSts(9);
taskWrk.setCompleteTime(now);//瀹岀粨鏃堕棿
taskWrkService.updateById(taskWrk);
return R.ok();
@@ -349,4 +352,32 @@
}
}
+ @PostMapping(value = "/taskWrk/state")
+// @ManagerAuth(memo = "鎺ユ敹RCS浠诲姟鐘舵��")
+ public R taskWrkState(@RequestBody NotifyDto notifyDto) {
+ log.info("鎺ユ敹RCS浠诲姟鐘舵��={}", notifyDto);
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(notifyDto.getSuperTaskNo());//wms浠诲姟鍙�
+ if (taskWrk == null) {
+ return R.error("娌℃湁鎵惧埌璇ヤ换鍔�={"+notifyDto+"}");
+ }
+ Date now = new Date();
+ if(notifyDto.getMsgType().equals("task_complete")&&taskWrk.getIoType()==3){
+ taskWrk.setWrkSts(9);//鏇存柊鏁版嵁瀹屾垚锛岀洿鎺ヨ浆鍘嗗彶妗�
+
+ //鏇存柊婧愬簱浣嶇姸鎬佷负绌哄簱浣�
+ LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
+ locMast.setLocSts("O");
+ locMastService.updateById(locMast);
+
+ //鏇存柊鐩爣搴撶姸鎬佷负鍦ㄥ簱
+ LocMast locMast2 = locMastService.selectByLocNo(taskWrk.getTargetPoint());
+ locMast2.setLocSts("F");
+ locMastService.updateById(locMast2);
+ taskWrk.setModiTime(now);//鎿嶄綔鏃堕棿
+ taskWrk.setModiUser(9998L);//鎿嶄綔鍛�
+ taskWrkService.updateById(taskWrk);
+ }
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1