From 90a0cf3b0a84756bcefceb2058317c541a4bb22c Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期四, 27 六月 2024 16:24:37 +0800
Subject: [PATCH] some status change to const
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java
index 9566bf2..3d40dbf 100644
--- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java
@@ -12,6 +12,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.*;
@@ -65,13 +66,13 @@
this.repairInfoDao = repairInfoDao;
}
+ @Transactional
public int save(QueryVo params) {
long workId = Long.parseLong(params.workId);
StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(workId);
if (workLast == null) {
throw new RuntimeException("绯荤粺涓病鏈夎鏉＄櫥褰曚俊鎭�");//宸ュ崟涓嶅瓨鍦�
}
- //fancy 2024/6/27 鏄笉鏄彲浠ヤ笉鐢ㄦ鏌ヤ换鍔′笌璁惧鐮�...
PrAssemblyPlan plan = assemblyPlanDao.selectByPrimaryKey(workLast.getPlanId());
// 楠岃瘉骞跺鐞嗚澶囧彿鍜岀墿鏂欏彿
Set<String> deviceSet = new HashSet<>(Arrays.asList(params.deviceNo.split(",")));
@@ -152,15 +153,17 @@
record.status = getStatus(params.status,node.isEnd);
return record;
}
- private int saveSnEx(StaAssemblyWorkLast workLast, List<String> deviceList,List<String> materialList, PrAssemblyPlan plan){
- StaWipSnEx snEx = new StaWipSnEx();
- snEx.deviceNo = deviceList.get(0);
- snEx.productNo = plan.batchNo;
- snEx.deviceNo = materialList.get(0);
- snEx.createTime = workLast.startTime;
- snEx.createBy = workLast.userId;
- snEx.productName = plan.proName;
- return wipSnExDao.insertSelective(snEx);
+ private void saveSnEx(StaAssemblyWorkLast workLast, List<String> deviceList,List<String> materialList, PrAssemblyPlan plan){
+ for (String material:materialList) {
+ StaWipSnEx snEx = new StaWipSnEx();
+ snEx.deviceNo = deviceList.get(0);
+ snEx.productId = plan.process.proId;
+ snEx.productNo = material;
+ snEx.createTime = workLast.startTime;
+ snEx.createBy = workLast.userId;
+ snEx.productName = plan.proName;
+ wipSnExDao.insertSelective(snEx);
+ }
}
/**
* 鐘舵��: 1:缁勮涓�,2:瀹屾垚,3:缁翠慨,4:鎶ュ簾
--
Gitblit v1.8.0