From 1d27648989e69042db607d14c474d9ea90f86d7b Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期五, 19 七月 2024 14:39:33 +0800
Subject: [PATCH] lineName change
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java | 42 ++++++++++++++++++++++++++++++++----------
1 files changed, 32 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 24aea10..f30c5d3 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
@@ -325,16 +325,6 @@
}
throw new RuntimeException("鐘舵�侀敊璇紝鏃犳晥鐨勮妭鐐圭被鍨�: " + workType);
}
-
-
-
-
-
-
-
-
-
-
public int repair(QueryVo vo) {
long workId = Long.parseLong(vo.workId);
StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(workId);
@@ -495,6 +485,7 @@
map.put("proName", "");
map.put("proType", "");
map.put("proId", "");
+ map.put("proCode", "");
//鍒ゆ柇鏄笉鏄槸鏈巶鐗╂枡
if(CollectionUtils.isEmpty(productList)){
productList = productDao.selectAll(null);
@@ -509,10 +500,41 @@
map.put("proType", product.getType());
BigInteger proId = BigInteger.valueOf(product.getId());
map.put("proId", proId.toString());
+ map.put("proCode",product.getCode());
}
return map;
}
+ /* 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);
+ }
+ 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;
+ }
+*/
public List<StaDeviceLife> queryLifeByDeviceNo(String deviceNo) {
return deviceLifeDao.selectByDeviceNo(deviceNo);
}
--
Gitblit v1.8.0