From ee7f2c1ff8b8bdc2352db35dc26253ac8e4d832d Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期三, 24 七月 2024 11:06:30 +0800
Subject: [PATCH] check station API add check line disabled
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java | 60 +++++++++++++++++++++++++-----------------------------------
1 files changed, 25 insertions(+), 35 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 19e17db..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,10 +3,8 @@
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.pmsGlobal.pojoBa.BaUser;
-import com.dy.pmsGlobal.pojoPlt.PltProduct;
import com.dy.pmsGlobal.pojoPlt.PltStation;
import com.dy.pmsGlobal.pojoPr.PrAssemblyPlan;
-import com.dy.pmsGlobal.pojoPr.PrProductionNode;
import com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast;
import jakarta.validation.Valid;
import lombok.extern.slf4j.Slf4j;
@@ -33,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);
}
@@ -44,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);
}
@@ -54,9 +54,22 @@
*/
@GetMapping(path="checkStationUsed")
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
@@ -64,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);
@@ -88,6 +102,7 @@
*/
@PostMapping(path="save")
public BaseResponse<StaAssemblyWorkLast> save(@RequestBody @Valid QueryVo last){
+ log.info("WorkOrderCtrl.save():{}",last.toString());
StaAssemblyWorkLast result = sv.save(last);
return BaseResponseUtils.buildSuccess(result);
}
@@ -98,8 +113,9 @@
* @return
*/
@PostMapping(path="logout")
- public BaseResponse<Boolean> logout(String id){
- int count = sv.logout(id);
+ public BaseResponse<Boolean> logout(String workId){
+ log.info("WorkOrderCtrl.logout():{}",workId);
+ int count = sv.logout(workId);
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
@@ -113,6 +129,7 @@
*/
@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("鏁版嵁搴撳瓨鍌ㄥけ璐�");
@@ -127,6 +144,8 @@
*/
@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("鏁版嵁搴撳瓨鍌ㄥけ璐�");
@@ -141,40 +160,11 @@
*/
@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);
}
- /**
- * 淇濆瓨鐧诲綍淇℃伅
- * @param
- * @return
- */
- @PostMapping(path="updateAssistant")
- public BaseResponse<List<BaUser>> updateAssistant(@RequestBody QueryVo vo){
- List<BaUser> result = sv.updateAssistant(vo);
- return BaseResponseUtils.buildSuccess(result);
- }
- /**
- * 鏍规嵁鑺傜偣鐨勬煡鍑鸿妭鐐逛綔涓氭寚瀵间功
- * @param
- * @return
- */
- @GetMapping(path="getSopByNodeId")
- public BaseResponse<PrProductionNode> getSopByNodeId(String nodeId){
- PrProductionNode result = sv.getSopByNodeId(nodeId);
- return BaseResponseUtils.buildSuccess(result);
- }
- /**
- * 鏍规嵁浜у搧鏌ュ嚭浜у搧鏂囦欢 涓昏鎶�鏈弬鏁�
- * @param
- * @return
- */
- @GetMapping(path="getFileByProId")
- public BaseResponse<PltProduct> getFileByProId(String proId){
- PltProduct result = sv.getFileByProId(proId);
- return BaseResponseUtils.buildSuccess(result);
- }
@GetMapping(path = "test")
public BaseResponse test() {
log.info("test");
--
Gitblit v1.8.0