From 44a9b4729e058e75dfba2892803038ee91963d77 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 25 九月 2023 15:28:50 +0800
Subject: [PATCH] 修改4.0 9.25
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/FinishedInspectServiceImpl.java | 38 +++++++++++++++++++++++---------------
1 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/FinishedInspectServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/FinishedInspectServiceImpl.java
index 48708b0..116f886 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/FinishedInspectServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/FinishedInspectServiceImpl.java
@@ -40,7 +40,7 @@
ManualTechnologyMapper manualTechnologyMapper;
@Resource
- ProductService productService;
+ ManualProductService manualProductService;
@Resource
InspectionItemService inspectionItemService;
@@ -66,8 +66,8 @@
public Integer addProcessInspectionSheet(String userId, FinishedInspectVo finishedInspectVo) {
//鏍规嵁鐢熶骇璁㈠崟id鏌ヨ缂栧埗宸ュ簭鐨勬渶鍚庝竴閬撳伐鑹�
List<ManualTechnology> manualTechnologyList = manualTechnologyMapper.selAllByMoId(finishedInspectVo.getId());
- //鑾峰彇鏈�鍚庝竴閬撳伐鑹哄叧鑱旂殑宸ヨ壓璺嚎id
- Integer technologyId = manualTechnologyList.get(0).getTechnologyId();
+ //鑾峰彇缂栧埗宸ヨ壓鏈�鍚庝竴閬撳伐鑹虹殑id
+ Integer mtId = manualTechnologyList.get(0).getId();
/*鏂板鎴愬搧妫�楠屽崟*/
FinishedInspect finishedInspect = new FinishedInspect();
finishedInspect.setUserId(Integer.parseInt(userId));
@@ -80,16 +80,13 @@
finishedInspect.setSpecificationsModel(finishedInspectVo.getSpecificationsModel());
finishedInspect.setMaterial(finishedInspectVo.getMaterial());
finishedInspect.setMaterialCode(finishedInspectVo.getMcode());
- finishedInspect.setTechId(technologyId);
+ //finishedInspect.setTechId(technologyId);
finishedInspectMapper.insert(finishedInspect);
/*鎵归噺鏂板鎴愬搧妫�楠岄」鐩崟*/
-
- /*//鏌ヨ鏍囧噯BOM鎶�鏈寚鏍囦腑璇ュ瀷鍙峰伐鑹轰笅鏈�鏂扮増鏈殑妫�楠岄」鐩�
- Integer ver = productService.selectVerByPro(specificationId).get(0);//璇ュ瀷鍙蜂笅鎶�鏈寚鏍囨渶鏂扮増鏈�*/
- List<Product> productList = productService.selProByVerSpe(technologyId);
- List<InspectionItem> inspectionItemList = productList.stream().map(product -> {
+ List<ManualProduct> manualProductList = manualProductService.selByMtid(mtId);
+ List<InspectionItem> inspectionItemList = manualProductList.stream().map(manualProduct -> {
InspectionItem inspectionItem = new InspectionItem();
- BeanUtils.copyProperties(product, inspectionItem);
+ BeanUtils.copyProperties(manualProductList, inspectionItem);
inspectionItem.setId(null);
inspectionItem.setCreateTime(new Date());
inspectionItem.setUpdateTime(new Date());
@@ -101,13 +98,14 @@
return finishedInspect.getId();
}
+
//涓婃姤(鏇存柊妫�楠岀姸鎬�)
@Override
@Transactional(rollbackFor = Exception.class)
- public String updateFinishInspectsById(String username,Integer id) {
+ public String updateFinishInspectsById(String username, Integer id,Integer number) {
/*鏇存柊妫�楠屽崟閲岄潰鐨勬楠岀粨璁�*/
//鍏堝垽鏂楠岀粨鏋�
- List<Integer> results = inspectionItemMapper.getResult(id,2);
+ List<Integer> results = inspectionItemMapper.getResult(id, 2);
int count = 0;
for (Integer result : results) {
if (result != null && result == 1) {
@@ -126,8 +124,18 @@
} else return "椤圭洰鏈楠屽畬!";
/*濡傛灉妫�楠岀粨璁轰负涓嶅悎鏍�,鍒欓渶瑕佹柊澧炰笉鍚堟牸妫�楠屽崟*/
if (finishedInspect.getResult() == 0) {
+ //鏌ヨ璇ユ楠屽崟鍝簺妫�楠岄」鐩笉鍚堟牸
+ List<InspectionItem> inspectionItemList = inspectionItemMapper.selectList(Wrappers.<InspectionItem>query()
+ .eq("inspect_id", id)
+ .eq("result", 0)
+ .eq("type", 2));
+ String msg = "";
+ for (InspectionItem inspectionItem : inspectionItemList) {
+ msg =msg+ inspectionItem.getName()+"-";
+ }
InspectUnaccepted finishUnaccepted = InspectUnaccepted.builder()
- .reason(finishedInspect.getMaterial() + "涓嶅悎鏍�") //鏆備笖瀹氫箟涓轰骇鍝佸悕绉颁笉鍚堟牸
+ .reason(msg + "涓嶅悎鏍�") //鏆備笖瀹氫箟涓洪」鐩�+涓嶅悎鏍�
+ .number(number)
.rawInspectId(id)
.type(1) //绫诲瀷涓烘垚鍝佹楠�
.build();
@@ -144,7 +152,7 @@
.eq(Repertory::getUnit, finishedInspect.getUnit())
.eq(Repertory::getType, 1);
Repertory rep = repertoryMapper.selectOne(queryWrapper);
- if (rep != null ) {
+ if (rep != null) {
rep.setNumber(rep.getNumber() + finishedInspect.getQuantity());
rep.setUserName(username);
repertoryMapper.updateById(rep);
@@ -169,7 +177,7 @@
//鍒嗛〉鏌ヨ鎴愬搧妫�楠屽崟鍒楄〃
@Override
public IPage<Map<String, Object>> selectFinishedInspectPage(Page<Object> page, Integer result, String material) {
- return finishedInspectMapper.selectFinishedInspectPage(page, result,material);
+ return finishedInspectMapper.selectFinishedInspectPage(page, result, material);
}
//鏍规嵁妫�楠屽崟id鏌ヨ鎴愬搧妫�楠屽崟璇︽儏
--
Gitblit v1.9.3