From bc3fe7ea8eecca4d36793b80bfbe2e212cde5b4f Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期二, 02 七月 2024 10:41:48 +0800
Subject: [PATCH] 修改测试库地址;pom文件打包时的依赖
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 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 3fa99a4..4db7548 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,11 +66,12 @@
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("宸ュ崟涓嶅瓨鍦�");
+ throw new RuntimeException("绯荤粺涓病鏈夎鏉＄櫥褰曚俊鎭�");//宸ュ崟涓嶅瓨鍦�
}
PrAssemblyPlan plan = assemblyPlanDao.selectByPrimaryKey(workLast.getPlanId());
// 楠岃瘉骞跺鐞嗚澶囧彿鍜岀墿鏂欏彿
@@ -87,10 +89,10 @@
});
if (deviceList.isEmpty()) {
- throw new RuntimeException("璁惧鍙蜂笉灞炰簬褰撳墠浠诲姟璁″垝");
+ throw new RuntimeException("璁惧鍙�("+ params.deviceNo +")鍧囦笉灞炰簬褰撳墠浠诲姟璁″垝");
}
if (deviceList.size() > 1) {
- throw new RuntimeException("璁惧鍙锋湁涓斿彧鑳芥湁涓�涓�");
+ throw new RuntimeException("璁惧鍙锋湁涓斿彧鑳芥湁涓�涓睘浜庡綋鍓嶄换鍔¤鍒�");
}
StaDeviceLast deviceLast = buildDeviceLast(params, workLast, deviceList.get(0));
@@ -151,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:鎶ュ簾
@@ -180,7 +184,7 @@
long workId = Long.parseLong(vo.workId);
StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(workId);
if (workLast == null) {
- throw new RuntimeException("宸ュ崟涓嶅瓨鍦�");
+ throw new RuntimeException("绯荤粺涓病鏈夎鏉＄櫥褰曚俊鎭�");
}
StaDeviceLast preDeviceRecord = deviceLastDao.selectByDeviceNo(vo.deviceNo);
StaRepairInfo repairInfo = new StaRepairInfo();
--
Gitblit v1.8.0