From d8a629a6f847acd2accbf150b5a341a9a1aed2ae Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期一, 24 六月 2024 17:11:02 +0800
Subject: [PATCH] logout
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java | 17 ++++++++++++++---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java | 35 +++++++++++++++++++++++++++++++++--
2 files changed, 47 insertions(+), 5 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..faf9b6c 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
@@ -81,13 +81,24 @@
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){
+ StaAssemblyWorkLast result = sv.save(last);
+ return BaseResponseUtils.buildSuccess(result);
+ }
+
+ /**
+ * 淇濆瓨鐧诲嚭淇℃伅
+ * @param
+ * @return
+ */
+ @PostMapping(path="logout")
+ public BaseResponse<Boolean> logout(String id){
+ int count = sv.logout(id);
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java
index 2168a9a..00d92c1 100644
--- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java
@@ -1,10 +1,12 @@
package com.dy.pmsStation.workOrder;
import com.alibaba.excel.util.StringUtils;
+import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.pmsGlobal.daoBa.BaUserMapper;
import com.dy.pmsGlobal.daoOth.OthFileMapper;
import com.dy.pmsGlobal.daoPlt.PltStationMapper;
import com.dy.pmsGlobal.daoPr.PrAssemblyPlanMapper;
+import com.dy.pmsGlobal.daoSta.StaAssemblyWorkHistoryMapper;
import com.dy.pmsGlobal.daoSta.StaAssemblyWorkLastMapper;
import com.dy.pmsGlobal.dyFile.FileOperate;
import com.dy.pmsGlobal.dyFile.FileRestVo;
@@ -14,6 +16,7 @@
import com.dy.pmsGlobal.pojoPr.PrAssemblyPlan;
import com.dy.pmsGlobal.pojoPr.PrProductionNode;
import com.dy.pmsGlobal.pojoPr.PrWorkingInstruction;
+import com.dy.pmsGlobal.pojoSta.StaAssemblyWorkHistory;
import com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -34,6 +37,7 @@
private BaUserMapper baUserDao;
private PltStationMapper pltStationDao;
private StaAssemblyWorkLastMapper assemblyWorkLastDao;
+ private StaAssemblyWorkHistoryMapper assemblyWorkHistoryDao;
private FileOperate fileOperate;
private OthFileMapper othFileMapper;
@Value("${dy.webFile.fmUrl}")
@@ -49,6 +53,10 @@
@Autowired
private void setPltStationDao(PltStationMapper pltStationDao){
this.pltStationDao = pltStationDao;
+ }
+ @Autowired
+ private void setStaAssemblyWorkHistoryDao(StaAssemblyWorkHistoryMapper assemblyWorkHistoryDao){
+ this.assemblyWorkHistoryDao = assemblyWorkHistoryDao;
}
@Autowired
private void setStaAssemblyWorkLastDao(StaAssemblyWorkLastMapper assemblyWorkLastDao){
@@ -150,7 +158,7 @@
return result;
}
@Transactional
- public int save(QueryVo last) {
+ public StaAssemblyWorkLast save(QueryVo last) {
//鍏坈heck
StaAssemblyWorkLast checkResult = checkStationUsed(last);
//鏍￠獙planId processId nodeId
@@ -179,6 +187,7 @@
staLast.setStartTime(new Date());
count = assemblyWorkLastDao.insertSelective(staLast);
}else{
+ //淇濆瓨涓�鏉istory?
BeanUtils.copyProperties(checkResult,staLast);
staLast.setPlanId(last.getPlanId());
staLast.setProcessId(last.getProcessId());
@@ -187,6 +196,29 @@
staLast.setStartTime(new Date());
count = assemblyWorkLastDao.updateByPrimaryKeySelective(staLast);
}
+ if (count <= 0) {
+ throw new RuntimeException("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ }
+ StaAssemblyWorkLast result = assemblyWorkLastDao.selectList(staLast).get(0);
+ return result;
+ }
+ @Transactional
+ public int logout(String id) {
+ //鎵惧埌鐧诲綍璁板綍
+ StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(Long.parseLong(id));
+ if(workLast == null){
+ throw new RuntimeException("绯荤粺涓病鏈夎鏉＄櫥褰曚俊鎭�");
+ }
+ //鏇存柊鐧诲綍璁板綍
+ workLast.setStatus(2);
+ workLast.setEndTime(new Date());
+ // 淇濆瓨history
+ StaAssemblyWorkHistory history = new StaAssemblyWorkHistory();
+ BeanUtils.copyProperties(workLast,history);
+ history.setId(null);
+ int count = assemblyWorkHistoryDao.insertSelective(history);
+ //鍒犻櫎last
+ assemblyWorkLastDao.deleteByPrimaryKey(Long.parseLong(id));
return count;
}
public List<PrAssemblyPlan> selectAssyPlanList(PrAssemblyPlan params){
@@ -213,5 +245,4 @@
ins.orgName = file.orgName;
ins.extName = file.extName;
}
-
}
\ No newline at end of file
--
Gitblit v1.8.0