From bf2368aba60129e66bcac80e60d22dc86ae5c1a3 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 30 七月 2024 15:11:25 +0800
Subject: [PATCH] 兼容无任务工作中的测试追溯信息
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java | 84 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 77 insertions(+), 7 deletions(-)
diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java
index 85fdce9..a560923 100644
--- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java
@@ -3,7 +3,6 @@
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.pmsGlobal.pojoBa.BaUser;
-import com.dy.pmsGlobal.pojoPlt.PltProductionLine;
import com.dy.pmsGlobal.pojoPlt.PltStation;
import com.dy.pmsGlobal.pojoPr.PrAssemblyPlan;
import com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast;
@@ -32,7 +31,8 @@
* @return
*/
@GetMapping(path="getUserInfo")
- public BaseResponse<BaUser> getUserInfo(String userId) throws Exception {
+ public BaseResponse<BaUser> getUserInfo(String userId){
+ log.info("getUserInfo:{}",userId);
BaUser userInfo = sv.getUserInfo(userId);
return BaseResponseUtils.buildSuccess(userInfo);
}
@@ -43,6 +43,7 @@
*/
@GetMapping(path="getStationInfo")
public BaseResponse<PltStation> getStationInfo(String stationId){
+ log.info("getStationInfo:{}",stationId);
PltStation stationInfo = sv.getStationInfo(stationId);
return BaseResponseUtils.buildSuccess(stationInfo);
}
@@ -52,10 +53,23 @@
* @return
*/
@GetMapping(path="checkStationUsed")
- public BaseResponse<StaAssemblyWorkLast> checkStationUsed(QueryVo last){
- StaAssemblyWorkLast stationInfo = sv.checkStationUsed(last);
+ public BaseResponse<StaAssemblyWorkLast> checkStationUsed(String stationId){
+ log.info("checkStationUsed:{}",stationId);
+ StaAssemblyWorkLast stationInfo = sv.checkStationUsed(stationId);
return BaseResponseUtils.buildSuccess(stationInfo);
}
+ /**
+ * 鏍规嵁workId鏌ヨworkLast
+ * @param
+ * @return
+ */
+ @GetMapping(path="getWorkLast")
+ public BaseResponse<StaAssemblyWorkLast> getWorkLast(String workId){
+ log.info("getWorkLast:{}",workId);
+ StaAssemblyWorkLast workLast = sv.getWorkLast(workId);
+ return BaseResponseUtils.buildSuccess(workLast);
+ }
+
/**
* 鏌ヨ鍏ㄩ儴鎵ц涓殑缁勮浠诲姟娓呭崟
* @param
@@ -63,6 +77,7 @@
*/
@GetMapping(path="planList")
public BaseResponse<List<PrAssemblyPlan>> selectAssyPlanList(){
+ log.info("selectAssyPlanList");
PrAssemblyPlan params = new PrAssemblyPlan();
params.setStatus(1);
List<PrAssemblyPlan> list = sv.selectAssyPlanList(params);
@@ -81,19 +96,74 @@
return BaseResponseUtils.buildSuccess(list);
}*/
/**
- * 鏌ヨ鍏ㄩ儴鎵ц涓殑缁勮浠诲姟娓呭崟
+ * 淇濆瓨鐧诲綍淇℃伅
* @param
* @return
*/
@PostMapping(path="save")
- public BaseResponse<Boolean> save(@RequestBody @Valid QueryVo last){
- int count = sv.save(last);
+ public BaseResponse<StaAssemblyWorkLast> save(@RequestBody @Valid QueryVo last){
+ log.info("WorkOrderCtrl.save():{}",last.toString());
+ StaAssemblyWorkLast result = sv.save(last);
+ return BaseResponseUtils.buildSuccess(result);
+ }
+
+ /**
+ * 淇濆瓨鐧诲嚭淇℃伅
+ * @param
+ * @return
+ */
+ @PostMapping(path="logout")
+ public BaseResponse<Boolean> logout(String workId){
+ log.info("WorkOrderCtrl.logout():{}",workId);
+ int count = sv.logout(workId);
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
return BaseResponseUtils.buildSuccess(true);
}
}
+ /**
+ * 娣诲姞鍗曚釜杈呭姪浜哄憳
+ * @param
+ * @return
+ */
+ @PostMapping(path="addAssistant")
+ public BaseResponse<Boolean> addAssistant(String workId ,String assistant){
+ log.info("WorkOrderCtrl.addAssistant():{},{}",workId,assistant);
+ int count = sv.addAssistant(workId,assistant);
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
+ }
+ }
+ /**
+ * 鍒犻櫎鍗曚釜杈呭姪浜哄憳
+ * @param
+ * @return
+ */
+ @PostMapping(path="removeAssistant")
+ public BaseResponse<Boolean> removeAssistant(String workId ,String assistant){
+ log.info("WorkOrderCtrl.removeAssistant():{},{}",workId,assistant);
+ log.info("WorkOrderCtrl.removeAssistant()");
+ int count = sv.removeAssistant(workId,assistant);
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
+ }
+ }
+ /**
+ * 鏌ヨ杈呭姪浜哄憳淇℃伅琛�
+ * @param
+ * @return
+ */
+ @GetMapping(path="getAssistantList")
+ public BaseResponse<List<BaUser>> getAssistantList(String workId){
+ log.info("WorkOrderCtrl.getAssistantList():{}",workId);
+ List<BaUser> result = sv.getAssistantList(workId);
+ return BaseResponseUtils.buildSuccess(result);
+ }
@GetMapping(path = "test")
public BaseResponse test() {
--
Gitblit v1.8.0