From 080b6ef99a53e35fc2c1fd5b4a3ef84e0656c98c Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期二, 16 七月 2024 16:23:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepCtrl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepCtrl.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepCtrl.java
index a8a4cb7..3033db5 100644
--- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepCtrl.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepCtrl.java
@@ -1,5 +1,6 @@
package com.dy.pmsStation.assemblyStep;
+import com.alibaba.excel.util.StringUtils;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.pmsGlobal.pojoPlt.PltProductFile;
@@ -117,7 +118,11 @@
public BaseResponse<Map<String,String>> queryByDeviceNo(String deviceNo) {
log.info("AssemblyStepCtrl.queryByDeviceNo():"+deviceNo);
Map<String,String> result = sv.queryByDeviceNo(deviceNo);
- return BaseResponseUtils.buildSuccess(result);
+ if(StringUtils.isBlank(result.get("proName"))){
+ return BaseResponseUtils.buildFail("璇ョ紪鐮�("+deviceNo +")涓嶆槸涓昏鐗╂枡(绯荤粺涓鎺х殑鍏朵粬璁惧)");
+ }else{
+ return BaseResponseUtils.buildSuccess(result);
+ }
}
@GetMapping(path = "queryLifeByDeviceNo")
--
Gitblit v1.8.0