From d5ed2998a3d11b6380dc6198e55d79969f3cb30b Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 23 七月 2024 17:30:09 +0800
Subject: [PATCH] login
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java | 33 ++++++++-------------------------
1 files changed, 8 insertions(+), 25 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 f30c5d3..3d7179b 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
@@ -211,8 +211,8 @@
private StaDeviceLast buildDeviceLast(QueryVo params, StaAssemblyWorkLast workLast, String deviceNo) {
//缁勮鏁版嵁
StaDeviceLast record = new StaDeviceLast();
- //pr_assembly_plan input_number +1 鎶曞叆鏁板姞1
- PrAssemblyPlan assemblyPlan = assemblyPlanDao.selectByPrimaryKey(workLast.planId);
+ //pr_assembly_plan input_number +1 鎶曞叆鏁板姞1 鏍规嵁deviceNo 鎵惧埌瀵瑰簲浠诲姟
+ PrAssemblyPlan assemblyPlan = queryPlanByDeviceNo(deviceNo); //PrAssemblyPlan assemblyPlan = assemblyPlanDao.selectByPrimaryKey(workLast.planId);
StaDeviceLast preRecord = deviceLastDao.selectByDeviceNo(deviceNo);
if (preRecord != null) {
record.id = preRecord.id;
@@ -504,37 +504,20 @@
}
return map;
}
-
- /* public PrAssemblyPlan queryPlanByDeviceNo(String deviceNo) {
+ //鏌ヨ浜у搧鎵�鍦ㄧ殑浠诲姟
+ public PrAssemblyPlan queryPlanByDeviceNo(String deviceNo) {
String proCode = "";
String lotCode = "";
if (StringUtils.isNotEmpty(deviceNo) && deviceNo.length() == 22) {
proCode = deviceNo.substring(3,6);
lotCode = deviceNo.substring(6,15);
}
- Map<String, String> map = new HashMap<>();
- map.put("deviceNo", deviceNo);
- map.put("proName", "");
- map.put("proType", "");
- map.put("proId", "");
- map.put("proCode", "");
- //鍒ゆ柇鏄笉鏄槸鏈巶鐗╂枡
- if(CollectionUtils.isEmpty(productList)){
- productList = productDao.selectAll(null);
+ PrAssemblyPlan plan = assemblyPlanDao.selectByDeviceNo(proCode,lotCode);
+ if(plan != null){
+ plan.setBatchNo(lotCode);
}
- PltProduct product = null;
-
- if (product != null) {
- map.put("deviceNo", deviceNo);
- map.put("proName", product.getName());
- map.put("proType", product.getType());
- BigInteger proId = BigInteger.valueOf(product.getId());
- map.put("proId", proId.toString());
- map.put("proCode",product.getCode());
- }
- return map;
+ return plan;
}
-*/
public List<StaDeviceLife> queryLifeByDeviceNo(String deviceNo) {
return deviceLifeDao.selectByDeviceNo(deviceNo);
}
--
Gitblit v1.8.0