From 75fab7170e1f26b83b0f31d65d4e164ca3bba107 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期三, 17 七月 2024 08:36:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepCtrl.java | 88 ++++++++++++++++-------------
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java | 38 ++++++------
2 files changed, 69 insertions(+), 57 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 3033db5..1e21a89 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,6 +1,6 @@
package com.dy.pmsStation.assemblyStep;
-import com.alibaba.excel.util.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.pmsGlobal.pojoPlt.PltProductFile;
@@ -19,13 +19,14 @@
import java.util.Map;
/**
- *璁板綍缁勮鍚勬楠�
+ * 璁板綍缁勮鍚勬楠�
*/
@Slf4j
@RestController
@RequestMapping(path = "assemblyStep")
public class AssemblyStepCtrl {
private AssemblyStepSv sv;
+
@Autowired
public void setSv(AssemblyStepSv sv) {
this.sv = sv;
@@ -33,8 +34,25 @@
@PostMapping(path = "save")
public BaseResponse save(@RequestBody @Valid QueryVo vo) {
- log.info("AssemblyStepCtrl.save():"+vo);
+ log.info("AssemblyStepCtrl.save():" + vo);
int count = sv.save(vo);
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
+ }
+ }
+
+ /**
+ * 娴嬭瘯鎴栧搧妫�閮借皟鐢ㄨ繖涓帴鍙�
+ *
+ * @param vo
+ * @return
+ */
+ @PostMapping(path = "testing")
+ public BaseResponse testing(@RequestBody @Valid QueryVo vo) {
+ log.info("AssemblyStepCtrl.testing():" + vo);
+ int count = sv.testing(vo);
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
} else {
@@ -44,7 +62,7 @@
@PostMapping(path = "repair")
public BaseResponse repair(@RequestBody @Valid QueryVo vo) {
- log.info("AssemblyStepCtrl.repair():"+vo);
+ log.info("AssemblyStepCtrl.repair():" + vo);
int count = sv.repair(vo);
if (count <= 0) {
return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
@@ -52,89 +70,81 @@
return BaseResponseUtils.buildSuccess(true);
}
}
+
/**
* 鏍规嵁鑺傜偣鐨勬煡鍑鸿妭鐐逛綔涓氭寚瀵间功
+ *
* @param
* @return
*/
- @GetMapping(path="getSopByNodeId")
- public BaseResponse<PrProductionNode> getSopByNodeId(String nodeId){
- log.info("AssemblyStepCtrl.getSopByNodeId():"+nodeId);
+ @GetMapping(path = "getSopByNodeId")
+ public BaseResponse<PrProductionNode> getSopByNodeId(String nodeId) {
+ log.info("AssemblyStepCtrl.getSopByNodeId():" + nodeId);
PrProductionNode result = sv.getSopByNodeId(nodeId);
return BaseResponseUtils.buildSuccess(result);
}
+
/**
* 鏍规嵁浜у搧鏌ュ嚭 涓昏鎶�鏈弬鏁�
+ *
* @param
* @return
*/
- @GetMapping(path="getParamsByProId")
- public BaseResponse<List<PltProductParams>> getParamsByProId(String proId){
- log.info("AssemblyStepCtrl.getParamsByProId():"+proId);
+ @GetMapping(path = "getParamsByProId")
+ public BaseResponse<List<PltProductParams>> getParamsByProId(String proId) {
+ log.info("AssemblyStepCtrl.getParamsByProId():" + proId);
List<PltProductParams> result = sv.getParamsByProId(proId);
return BaseResponseUtils.buildSuccess(result);
}
+
/**
* 鏍规嵁浜у搧鏌ュ嚭浜у搧鏂囦欢 涓昏鎶�鏈弬鏁�
+ *
* @param
* @return
*/
- @GetMapping(path="getFileByProId")
- public BaseResponse<List<PltProductFile>> getFileByProId(String proId){
- log.info("AssemblyStepCtrl.getFileByProId():"+proId);
+ @GetMapping(path = "getFileByProId")
+ public BaseResponse<List<PltProductFile>> getFileByProId(String proId) {
+ log.info("AssemblyStepCtrl.getFileByProId():" + proId);
List<PltProductFile> result = sv.getFileByProId(proId);
return BaseResponseUtils.buildSuccess(result);
}
+
@GetMapping(path = "getQualityItems")
public BaseResponse<List<PltProductQualityInspectionItems>> getQualityItems(String proId) {
- log.info("AssemblyStepCtrl.getQualityItems():"+proId);
+ log.info("AssemblyStepCtrl.getQualityItems():" + proId);
List<PltProductQualityInspectionItems> result = sv.getQualityItems(proId);
return BaseResponseUtils.buildSuccess(result);
}
+
@GetMapping(path = "getTestItems")
public BaseResponse<List<PltProductTestInspectionItems>> getTestItems(String proId) {
- log.info("AssemblyStepCtrl.getTestItems():"+proId);
+ log.info("AssemblyStepCtrl.getTestItems():" + proId);
List<PltProductTestInspectionItems> result = sv.getTestItems(proId);
return BaseResponseUtils.buildSuccess(result);
}
- /**
- * 娴嬭瘯鎴栧搧妫�閮借皟鐢ㄨ繖涓帴鍙�
- * @param vo
- * @return
- */
- @PostMapping(path = "testing")
- public BaseResponse testing(@RequestBody @Valid QueryVo vo) {
- log.info("AssemblyStepCtrl.testing():"+vo);
- int count = sv.testing(vo);
- if (count <= 0) {
- return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�");
- } else {
- return BaseResponseUtils.buildSuccess(true);
- }
- }
-
@GetMapping(path = "queryByDeviceNo")
- public BaseResponse<Map<String,String>> queryByDeviceNo(String deviceNo) {
- log.info("AssemblyStepCtrl.queryByDeviceNo():"+deviceNo);
- Map<String,String> result = sv.queryByDeviceNo(deviceNo);
- if(StringUtils.isBlank(result.get("proName"))){
- return BaseResponseUtils.buildFail("璇ョ紪鐮�("+deviceNo +")涓嶆槸涓昏鐗╂枡(绯荤粺涓鎺х殑鍏朵粬璁惧)");
- }else{
+ public BaseResponse<Map<String, String>> queryByDeviceNo(String deviceNo) {
+ log.info("AssemblyStepCtrl.queryByDeviceNo():" + deviceNo);
+ Map<String, String> result = sv.queryByDeviceNo(deviceNo, null);
+ if (StringUtils.isBlank(result.get("proName"))) {
+ return BaseResponseUtils.buildFail("璇ョ紪鐮�(" + deviceNo + ")涓嶆槸涓昏鐗╂枡(绯荤粺涓鎺х殑鍏朵粬璁惧)");
+ } else {
return BaseResponseUtils.buildSuccess(result);
}
}
@GetMapping(path = "queryLifeByDeviceNo")
public BaseResponse<?> queryLifeByDeviceNo(String deviceNo) {
- log.info("AssemblyStepCtrl.queryLifeByDeviceNo():"+deviceNo);
+ log.info("AssemblyStepCtrl.queryLifeByDeviceNo():" + deviceNo);
List<StaDeviceLife> result = sv.queryLifeByDeviceNo(deviceNo);
return BaseResponseUtils.buildSuccess(result);
}
@GetMapping(path = "queryLogByDeviceNo")
public BaseResponse<?> queryLogByDeviceNo(String deviceNo) {
- log.info("AssemblyStepCtrl.queryLogByDeviceNo():"+deviceNo);
+ log.info("AssemblyStepCtrl.queryLogByDeviceNo():" + deviceNo);
List<StaDeviceProductionLog> result = sv.queryLogByDeviceNo(deviceNo);
return BaseResponseUtils.buildSuccess(result);
}
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 96edc4a..ddb5aa2 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
@@ -155,17 +155,9 @@
deviceList.add(deviceNo);
} else {
//鍒ゆ柇鏄笉鏄槸鏈巶鐗╂枡,濡傛灉鏄�,鍒欐坊鍔犵墿鏂欏埌ex琛ㄤ腑
- PltProduct product = null;
- if (StringUtils.isNotEmpty(deviceNo) && deviceNo.length() == 22) {
- product = productList.stream().filter(p -> deviceNo.startsWith(QrCodeConstant.TypeProduct + p.getCode())).findFirst().orElse(null);
- }
- if(product != null){
- Map<String, String> map = new HashMap<>();
- map.put("deviceNo", deviceNo);
- map.put("proName", product.getName());
- BigInteger proId = BigInteger.valueOf(product.getId());
- map.put("proId", proId.toString());
- materialList.add(map);
+ Map<String, String> result = queryByDeviceNo(deviceNo, productList);
+ if (StringUtils.isNotBlank(result.get("proName"))) {
+ materialList.add(result);
}
}
});
@@ -334,11 +326,14 @@
if (workLast == null) {
throw new RuntimeException("绯荤粺涓病鏈夎鏉＄櫥褰曚俊鎭�");
}
-
StaDeviceLast deviceLast = buildDeviceLast(vo, workLast, vo.deviceNo[0]);
int count = deviceLast.id == null ? deviceLastDao.insertSelective(deviceLast) :
deviceLastDao.updateByPrimaryKeySelective(deviceLast);
saveDeviceProductionLog(deviceLast);
+ PrProductionNode node = nodeDao.selectByPrimaryKey(workLast.nodeId);
+ if (node.isRecord) {
+ saveDeviceLife(deviceLast);
+ }
return count;
}
@@ -451,20 +446,27 @@
return fileRestVo.fileWebUrl + file.filePath;
}
- public Map<String, String> queryByDeviceNo(String deviceNo) {
+ public Map<String, String> queryByDeviceNo(String deviceNo,List<PltProduct> productList) {
Map<String, String> map = new HashMap<>();
map.put("deviceNo", deviceNo);
map.put("proName", "");
map.put("proType", "");
-
- PltProduct product = productDao.selectByCode(deviceNo.substring(3, 6));
+ map.put("proId", "");
+ //鍒ゆ柇鏄笉鏄槸鏈巶鐗╂枡
+ if(CollectionUtils.isEmpty(productList)){
+ productList = productDao.selectAll(null);
+ }
+ PltProduct product = null;
+ if (StringUtils.isNotEmpty(deviceNo) && deviceNo.length() == 22) {
+ product = productList.stream().filter(p -> deviceNo.startsWith(QrCodeConstant.TypeProduct + p.getCode())).findFirst().orElse(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());
}
- /*else{
- throw new RuntimeException("璇ョ紪鐮�("+deviceNo +")涓嶆槸涓昏鐗╂枡(绯荤粺涓鎺х殑鍏朵粬璁惧)");
- }*/
return map;
}
--
Gitblit v1.8.0