From 9cb1f5cf9cc383d8f09b0735e75ee7a0ef181804 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 19 十月 2024 11:11:00 +0800
Subject: [PATCH] 优化代码，修改注解信息
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 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 860b7d3..76d27ab 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 com.dy.pmsGlobal.pojoOth.OthFile;
import com.dy.pmsGlobal.pojoPlt.*;
import com.dy.pmsGlobal.pojoPr.PrAssemblyPlan;
+import com.dy.pmsGlobal.pojoPr.PrBillOfMaterial;
import com.dy.pmsGlobal.pojoPr.PrProductionNode;
import com.dy.pmsGlobal.pojoPr.PrWorkingInstruction;
import com.dy.pmsGlobal.pojoSta.*;
@@ -456,6 +457,9 @@
if (node.instruction != null) {
addUrl(node.instruction);
}
+ if (node.bill != null) {
+ addBillUrl(node.bill);
+ }
return node;
}
@@ -604,5 +608,17 @@
return deviceProductionLogDao.selectByDeviceNo(devoiceNo);
}
-
+ private void addBillUrl(PrBillOfMaterial bill) {
+ if (bill == null || bill.fileId == null) {
+ return;
+ }
+ OthFile file = othFileMapper.selectByPrimaryKey(bill.fileId);
+ if (file == null) {
+ return;
+ }
+ FileRestVo fileRestVo = fileOperate.parseHashcode(fmUrl, file.hash);
+ bill.webUrl = fileRestVo.fileWebDownloadPath + bill.fileId;
+ bill.orgName = file.orgName;
+ bill.extName = file.extName;
+ }
}
--
Gitblit v1.8.0