From 30ca7a8dc82a7cfadadb37d8e9e6b8e68be06f27 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 08 五月 2025 13:06:51 +0800
Subject: [PATCH] 检验项添加抽样类型绑定
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java | 75 ++++++++++++++++++++-----------------
1 files changed, 40 insertions(+), 35 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
index de04143..b8dd63e 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
@@ -499,13 +499,15 @@
}
}
- //鏌ヨ妫�楠屽崟淇℃伅
// 娣诲姞宸ユ椂
- InsProduct finalInsProduct = insProductMapper.selectById(product.getId());
- threadPoolTaskExecutor.execute(() -> {
- InsOrder insOrder = insOrderMapper.selectById(insSample.getInsOrderId());
- this.addAuxiliary(userId, finalInsProduct, insOrder);
- });
+ // 鍒ゆ柇鏄惁鍙槸鍙備笌璁＄畻鍊�, 鍙備笌璁＄畻鍊煎疄闄呮病鏈夊～鍐�
+ if (StringUtils.isNotBlank(newResult.getInsValue()) && !newResult.getInsValue().equals("[]")) {
+ InsProduct finalInsProduct = insProductMapper.selectById(product.getId());
+ threadPoolTaskExecutor.execute(() -> {
+ InsOrder insOrder = insOrderMapper.selectById(insSample.getInsOrderId());
+ this.addAuxiliary(userId, finalInsProduct, insOrder);
+ });
+ }
}
});
@@ -876,22 +878,8 @@
this.addProductSpotCheck(insSamples, order);
}
- // 12.娣诲姞宸ユ椂
-// // 鍒犻櫎鍘熸湰璁㈠崟宸ユ椂
-// auxiliaryOutputWorkingHoursService.remove(Wrappers.<AuxiliaryOutputWorkingHours>lambdaQuery()
-// .eq(AuxiliaryOutputWorkingHours::getOrderId, orderId));
-// // 鏌ヨ宸ユ椂鏆傚瓨
-// List<AuxiliaryOutputWorkingHoursTemporary> hoursTemporaries = auxiliaryOutputWorkingHoursTemporaryService.list(Wrappers.<AuxiliaryOutputWorkingHoursTemporary>lambdaQuery()
-// .eq(AuxiliaryOutputWorkingHoursTemporary::getOrderId, orderId));
-// List<AuxiliaryOutputWorkingHours> outputWorkingHours = hoursTemporaries.stream().map(hoursTemporary -> {
-// AuxiliaryOutputWorkingHours workingHours = new AuxiliaryOutputWorkingHours();
-// BeanUtil.copyProperties(hoursTemporary, workingHours);
-// workingHours.setId(null);
-// return workingHours;
-// }).collect(Collectors.toList());
-// auxiliaryOutputWorkingHoursService.saveBatch(outputWorkingHours);
- // 13.娣诲姞璁㈠崟璐圭敤缁熻淇℃伅
+ // 12.娣诲姞璁㈠崟璐圭敤缁熻淇℃伅
List<InsProduct> productList = insProductMapper.selectProductByOrderId(orderId);
// 鍒犻櫎鍘熸湰璐圭敤淇℃伅
insOrderRatesService.remove(Wrappers.<InsOrderRates>lambdaQuery()
@@ -914,7 +902,7 @@
insOrderRatesService.saveBatch(orderRatesList);
- // 14.鍙戦�佷紒涓氬井淇￠�氱煡
+ // 13.鍙戦�佷紒涓氬井淇￠�氱煡
// 鏌ヨ鍘熸潗鏂�
IfsInventoryQuantity ifsInventoryQuantity = ifsInventoryQuantityMapper.selectById(order.getIfsInventoryId());
// 鏌ヨ鏍峰搧淇℃伅
@@ -939,18 +927,18 @@
}
});
- // 15.ifs绉诲簱(鍘熸潗鏂欓渶瑕佽繘琛岀Щ搴撴搷浣�) --> 鏈�鍚庢墽琛�,鍥犱负澶辫触鏃犳硶鍥炴粴
+ // 14.ifs绉诲簱(鍘熸潗鏂欓渶瑕佽繘琛岀Щ搴撴搷浣�) --> 鏈�鍚庢墽琛�,鍥犱负澶辫触鏃犳硶鍥炴粴
if (ifsInventoryQuantity != null) {
// 鐧昏妫�楠岀粨鏋�
// 鍒ゆ柇鏄惁鏈変笉鍚堟牸, 鏈変笉鍚堟牸涓嶈兘绉诲簱
// todo: ifs绉诲簱
insReportService.isRawMaterial(order);
- // 16 鍒ゆ柇褰撳墠鏍峰搧鏄惁涓哄師鏉愭枡, 鍘熸潗鏂欓渶瑕佽繘琛屾暟鎹垎鏋�, 鍒ゆ柇涔嬪墠10鏉℃暟鎹悓涓�涓緵搴斿晢, 鍚屼竴涓楠岄」鐨勫亸宸槸鍚﹁秴杩�10%
+ // 15 鍒ゆ柇褰撳墠鏍峰搧鏄惁涓哄師鏉愭枡, 鍘熸潗鏂欓渶瑕佽繘琛屾暟鎹垎鏋�, 鍒ゆ柇涔嬪墠10鏉℃暟鎹悓涓�涓緵搴斿晢, 鍚屼竴涓楠岄」鐨勫亸宸槸鍚﹁秴杩�10%
// 鏌ヨifs淇℃伅鑾峰彇鑾峰彇鍓�10涓緵搴斿晢涓�鏍风殑, 妫�楠岄」涓�鏍蜂俊鎭�
threadPoolTaskExecutor.execute(() -> {
// 娣诲姞鍒嗘瀽鏁版嵁
- addAnalysis(productList, ifsInventoryQuantity, order, userName);
+ addAnalysis(productList, ifsInventoryQuantity, order, sendUserAccount);
});
@@ -978,13 +966,13 @@
* @param ifsInventoryQuantity
* @param order
*/
- private void addAnalysis(List<InsProduct> productList, IfsInventoryQuantity ifsInventoryQuantity, InsOrder order, String userName) {
+ private void addAnalysis(List<InsProduct> productList, IfsInventoryQuantity ifsInventoryQuantity, InsOrder order, String sendUserAccount) {
for (InsProduct insProduct : productList) {
// 鍒ゆ柇鏄惁鏄暟鍊肩被鍨�
if (insProduct.getInspectionValueType().equals("1") && insProduct.getInsResult().equals(1)) {
List<InsProductDeviationWarningDetail> insProductAnalysisDtoList = insProductMapper.selectAnalysis(insProduct, ifsInventoryQuantity.getSupplierName());
- if (insProductAnalysisDtoList.size() < 5) {
+ if (insProductAnalysisDtoList.size() < 10) {
continue;
}
@@ -1045,10 +1033,10 @@
message += "\n妫�楠岄」: " + insProduct.getInspectionItem() + insProduct.getInspectionItemSubclass();
message += "\n鍋忓樊瓒呰繃浜� 10%";
// 鍙戦�佺粰鎻愪氦浜�
- WxCpUtils.inform(userName, message, null);
-
- // todo: 鍙戦�佺粰妫�娴嬩腑蹇冧富浠�(鍥哄畾姝�)
- WxCpUtils.inform("ZT-004704", message, null);
+// WxCpUtils.inform(sendUserAccount, message, null);
+//
+// // todo: 鍙戦�佺粰妫�娴嬩腑蹇冧富浠�(鍥哄畾姝�)
+// WxCpUtils.inform("ZT-004704", message, null);
} catch (Exception e) {
e.printStackTrace();
log.error("鍋忓樊棰勮浼佷笟寰俊閫氱煡鎶ラ敊");
@@ -1320,7 +1308,6 @@
/**
* 鏂板涓嶅悎鏍煎娴嬪唴瀹�
- * @param ids
* @return
*/
@Override
@@ -1336,6 +1323,20 @@
// 鏌ヨ涓嶅悎鏍煎唴瀹�
List<InsUnqualifiedRetestProduct> list = insUnqualifiedRetestProductMapper.selectRetestProduct(ids);
+ // 寰幆鍒ゆ柇鏄惁鏄粦瀹氬��, 缁戝畾鍊间慨鏀规楠岃姹�
+ for (InsUnqualifiedRetestProduct insUnqualifiedRetestProduct : list) {
+ for (InsProduct insProduct : insProductsList) {
+ if (insProduct.getIsBinding().equals(1)) {
+ insUnqualifiedRetestProduct.setIsBinding(1);
+ insUnqualifiedRetestProduct.setAsk(null);
+ insUnqualifiedRetestProduct.setTell(null);
+ insUnqualifiedRetestProduct.setPrice(null);
+ insUnqualifiedRetestProduct.setManHour(null);
+ insUnqualifiedRetestProduct.setSection(null);
+ }
+ }
+ }
+
// 鏂板涓嶅悎鏍煎唴瀹�
insUnqualifiedRetestProductService.saveBatch(list);
list.forEach(insUnqualifiedRetestProduct -> {
@@ -2013,7 +2014,7 @@
insReportMapper.delete(Wrappers.<InsReport>lambdaQuery()
.eq(InsReport::getInsOrderId, insOrder.getId()));
insReportMapper.insert(insReport);
-
+ inputStream.close();
} catch (IOException e) {
throw new RuntimeException(e);
}
@@ -2154,7 +2155,6 @@
* @param
*/
private void addBitReport(Integer orderId, InsOrder insOrder) {
- Map<String, String> user = insProductMapper.selectUserById(insOrder.getUserId());
//samples鏄笉鍖呮嫭甯︽湁"/"鐨勬牱鍝�
List<SampleProductDto> samples = insSampleMapper.selectSampleProductListByOrderId(orderId);
InsReport insReport = new InsReport();
@@ -2173,7 +2173,6 @@
boolean isOneSample = samples.size() == 1 ? true : false;
/*鍩虹鎶ュ憡(鏍规嵁缁樺埗鐨勫師濮嬭褰曟ā鐗堝舰鎴�)*/
samples.forEach(a -> {
- Map<Integer, String> map2 = new HashMap<>();
models.add(a.getModel());
String standardMethodCode = baseMapper.getStandardMethodCode(a.getStandardMethodListId());
if (StrUtil.isNotBlank(a.getSpecialStandardMethod())) {
@@ -2568,6 +2567,7 @@
insReportMapper.delete(Wrappers.<InsReport>lambdaQuery()
.eq(InsReport::getInsOrderId, insOrder.getId()));
insReportMapper.insert(insReport);
+ inputStream.close();
} catch (IOException e) {
throw new RuntimeException(e);
}
@@ -4242,6 +4242,11 @@
// 淇濆瓨鍒伴檮浠堕噷闈�
uploadFile(insOrderId, multipartFile);
+ try {
+ inputStream.close();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
}
--
Gitblit v1.9.3