From 61dd57e20762783c19001df50b046d0132ed6af5 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期六, 22 六月 2024 11:28:02 +0800
Subject: [PATCH] save user
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/QueryVo.java | 57 +++++++++++++++++++
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 | 47 +++++++++++++++
3 files changed, 119 insertions(+), 2 deletions(-)
diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/QueryVo.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/QueryVo.java
index 8599ce2..d5abea5 100644
--- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/QueryVo.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/QueryVo.java
@@ -2,8 +2,12 @@
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.dy.common.webUtil.QueryConditionVo;
+import jakarta.validation.constraints.NotNull;
import lombok.*;
+
+import java.util.Date;
@Data
@EqualsAndHashCode(callSuper = false)
@@ -14,15 +18,68 @@
public class QueryVo {
@JSONField(serializeUsing= ObjectWriterImplToString.class)
public Long id;
+ /**
+ * 鐢ㄦ埛瀹炰綋缂栧彿
+ */
+ @NotNull(message="[鐢ㄦ埛瀹炰綋缂栧彿]涓嶈兘涓虹┖")
public String userId;
+ /**
+ * 鐢熶骇绾垮疄浣撶紪鍙�
+ */
@JSONField(serializeUsing= ObjectWriterImplToString.class)
public Long lineId;
+ /**
+ * 宸ョ珯瀹炰綋缂栧彿
+ */
+ @NotNull(message="[宸ョ珯瀹炰綋缂栧彿]涓嶈兘涓虹┖")
public String stationId;
+ /**
+ * 缁勮鐢熶骇浠诲姟瀹炰綋缂栧彿
+ */
+ @NotNull(message="[缁勮鐢熶骇浠诲姟瀹炰綋缂栧彿]涓嶈兘涓虹┖")
@JSONField(serializeUsing= ObjectWriterImplToString.class)
public Long planId;
+ /**
+ * 鐢熶骇娴佺▼瀹炰綋缂栧彿
+ */
+ @NotNull(message="[鐢熶骇娴佺▼瀹炰綋缂栧彿]涓嶈兘涓虹┖")
@JSONField(serializeUsing= ObjectWriterImplToString.class)
public Long processId;
+ /**
+ * 鐢熶骇娴佺▼鑺傜偣瀹炰綋缂栧彿
+ */
+ @NotNull(message="[鐢熶骇娴佺▼鑺傜偣瀹炰綋缂栧彿]涓嶈兘涓虹┖")
@JSONField(serializeUsing= ObjectWriterImplToString.class)
public Long nodeId;
+ /**
+ * 浠诲姟璁ら鏃堕棿
+ */
+ public Date dt;
+ /**
+ * 鐘舵��:姝ｅ父(1)銆佺粨鏉�(0)
+ */
+ public Integer status;
+ /**
+ * 寮�濮嬫椂闂�
+ */
+ public Date startTime;
+ /**
+ * 缁撴潫鏃堕棿
+ */
+ public Date endTime;
+ /**
+ * 杈呭姪浜哄憳:杈呭姪鍛樺伐id,浠ラ�楀彿闅斿紑
+ */
public String assistants;
+
+
+
+
+
+
+
+
+
+
+
}
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 867d237..7fd51c1 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,9 +3,11 @@
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;
+import jakarta.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -68,6 +70,21 @@
List<PrAssemblyPlan> list = sv.selectList(params);
return BaseResponseUtils.buildSuccess(list);
}*/
+ /**
+ * 鏌ヨ鍏ㄩ儴鎵ц涓殑缁勮浠诲姟娓呭崟
+ * @param
+ * @return
+ */
+ @PostMapping(path="save")
+ public BaseResponse<Boolean> save(@RequestBody @Valid QueryVo last){
+ int count = sv.save(last);
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
+ }
+ }
+
@GetMapping(path = "test")
public BaseResponse test() {
log.info("test");
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 1cc15ce..8c285b3 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
@@ -13,14 +13,17 @@
import com.dy.pmsGlobal.dyFile.FileRestVo;
import com.dy.pmsGlobal.pojoBa.BaUser;
import com.dy.pmsGlobal.pojoOth.OthFile;
+import com.dy.pmsGlobal.pojoPlt.PltProductionLine;
import com.dy.pmsGlobal.pojoPlt.PltStation;
import com.dy.pmsGlobal.pojoPr.PrAssemblyPlan;
import com.dy.pmsGlobal.pojoPr.PrWorkingInstruction;
import com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@@ -176,5 +179,45 @@
ins.orgName = file.orgName;
ins.extName = file.extName;
}
-
-}
+ @Transactional
+ public int save(QueryVo last) {
+ //鍏坈heck
+ PltStation stationInfo = null;
+ BaUser userInfo = null;
+ //宸ョ珯103
+ if(last.getStationId().startsWith("103")){
+ stationInfo = getStationInfo(last.getStationId());
+ }else{
+ userInfo = getUserInfo(last.getStationId());
+ }
+ if(last.getUserId().startsWith("103")){
+ stationInfo = getStationInfo(last.getUserId());
+ }else{
+ userInfo = getUserInfo(last.getUserId());
+ }
+ if(userInfo == null && stationInfo == null){
+ throw new RuntimeException("鍛樺伐缂栫爜:"+ last.getUserId() + "鍜屽伐绔欑紪鐮�:" + last.getStationId() + "涓嶆纭�,璇锋鏌�");
+ }else if(userInfo == null){
+ throw new RuntimeException("鍛樺伐缂栫爜:"+ last.getUserId() + "涓嶆纭�,璇锋鏌�");
+ }else if(stationInfo == null){
+ throw new RuntimeException("宸ョ珯缂栫爜:" + last.getStationId() + "涓嶆纭�,璇锋鏌�");
+ }
+ //鏍￠獙planId processId nodeId
+ PrAssemblyPlan params = new PrAssemblyPlan();
+ params.setStatus(1);
+ params.setId(last.getPlanId());
+ params.setProcessId(last.getProcessId());
+ List<PrAssemblyPlan> list = selectAssyPlanList(params);
+ list.stream().filter(process -> {
+ process.nodes.stream().filter(node -> node.id == last.getNodeId());
+ return false;
+ });
+ last.setLineId(stationInfo.getLineId());
+ StaAssemblyWorkLast staLast = new StaAssemblyWorkLast();
+ BeanUtils.copyProperties(last,staLast);
+ staLast.setUserId(userInfo.getId());
+ staLast.setStationId(stationInfo.getId());
+ int count = assemblyWorkLastDao.insertSelective(staLast);
+ return count;
+ }
+}
\ No newline at end of file
--
Gitblit v1.8.0