From 1d66b4f88c795ea55bdd72b7b245a3bcce1237c0 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 09 七月 2024 16:57:29 +0800
Subject: [PATCH] change deviceNO to array
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/QueryVo.java | 2 +-
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java | 10 +++++-----
2 files changed, 6 insertions(+), 6 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 f7d2c49..cf7956c 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
@@ -131,7 +131,7 @@
}
PrAssemblyPlan plan = assemblyPlanDao.selectByPrimaryKey(workLast.getPlanId());
// 楠岃瘉骞跺鐞嗚澶囧彿鍜岀墿鏂欏彿
- Set<String> deviceSet = new HashSet<>(Arrays.asList(params.deviceNo.split(",")));
+ Set<String> deviceSet = new HashSet<>(Arrays.asList(params.deviceNo));
// 鍒嗙被璁惧鍙峰拰鐗╂枡鍙�
List<String> deviceList = new ArrayList<>();
List<String> materialList = new ArrayList<>();
@@ -266,17 +266,17 @@
if (workLast == null) {
throw new RuntimeException("绯荤粺涓病鏈夎鏉＄櫥褰曚俊鎭�");
}
- StaDeviceLast preDeviceRecord = deviceLastDao.selectByDeviceNo(vo.deviceNo);
+ StaDeviceLast preDeviceRecord = deviceLastDao.selectByDeviceNo(vo.deviceNo[0]);
StaRepairInfo repairInfo = new StaRepairInfo();
repairInfo.workId = workId;
- repairInfo.deviceNo = vo.deviceNo;
+ repairInfo.deviceNo = vo.deviceNo[0];
repairInfo.repairTime = new Date();
repairInfo.repairBy = workLast.userId;
repairInfo.repairReason = vo.errorMsg;
repairInfo.fromNode = preDeviceRecord.currNode;
repairInfoDao.insertSelective(repairInfo);
- StaDeviceLast deviceLast = buildDeviceLast(vo, workLast, vo.deviceNo);
+ StaDeviceLast deviceLast = buildDeviceLast(vo, workLast, vo.deviceNo[0]);
int count = deviceLast.id == null ? deviceLastDao.insertSelective(deviceLast) :
deviceLastDao.updateByPrimaryKeySelective(deviceLast);
@@ -295,7 +295,7 @@
throw new RuntimeException("绯荤粺涓病鏈夎鏉＄櫥褰曚俊鎭�");
}
- StaDeviceLast deviceLast = buildDeviceLast(vo, workLast, vo.deviceNo);
+ StaDeviceLast deviceLast = buildDeviceLast(vo, workLast, vo.deviceNo[0]);
int count = deviceLast.id == null ? deviceLastDao.insertSelective(deviceLast) :
deviceLastDao.updateByPrimaryKeySelective(deviceLast);
saveDeviceProductionLog(deviceLast);
diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/QueryVo.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/QueryVo.java
index cf50dc4..86e274f 100644
--- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/QueryVo.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/QueryVo.java
@@ -12,7 +12,7 @@
@Builder
public class QueryVo{
@NotEmpty(message = "璁惧缂栧彿涓嶈兘涓虹┖")
- public String deviceNo;
+ public String[] deviceNo;
@NotNull(message = "浠诲姟缂栧彿涓嶈兘涓虹┖")
public String workId;
@NotNull(message = "鐘舵�佷笉鑳戒负绌�")
--
Gitblit v1.8.0