From e24852ee175fc8c1ccc0dbb080caa18793f0070e Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期五, 07 六月 2024 02:54:29 +0800
Subject: [PATCH] 实现“熔接损耗项目”
---
inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java | 2 +-
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java | 3 ++-
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 21 ++++++++++++++++++---
inspect-server/src/main/resources/mapper/InsBushingMapper.xml | 7 +++----
4 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
index a038eac..5e98366 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
@@ -70,7 +70,8 @@
JSONArray jsonArray = JSON.parseArray(map.get("list")+"");
List<SampleProductDto> list = jsonArray.toJavaList(SampleProductDto.class);
InsOrder insOrder = JSON.parseObject(JSON.toJSONString(map.get("insOrder")), InsOrder.class);
- return Result.success(insOrderService.addInsOrder(list, insOrder));
+ List<List<Integer>> pairing = JSON.parseArray(map.get("pairing")+"");
+ return Result.success(insOrderService.addInsOrder(list, insOrder, pairing));
}
@ApiOperation(value = "鏌ヨ璁㈠崟鏈�闀块璁℃椂闂�")
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java
index b5da779..d5f7bc6 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java
@@ -22,7 +22,7 @@
//淇敼妫�楠屼笅鍗曟暟鎹�
int upInsOrder(Integer orderId,Integer sampleId, String appointed, Integer userId);
- int addInsOrder(List<SampleProductDto> list, InsOrder insOrder);
+ int addInsOrder(List<SampleProductDto> list, InsOrder insOrder, List<List<Integer>> pairing);
Map<String, Object> getInsOrder(Integer id);
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
index cd585b3..a832e63 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
@@ -2,6 +2,7 @@
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -26,6 +27,8 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
/**
@@ -127,16 +130,18 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public int addInsOrder(List<SampleProductDto> list, InsOrder insOrder) {
+ public int addInsOrder(List<SampleProductDto> list, InsOrder insOrder, List<List<Integer>> pairing) {
insOrder.setState(0);
String code = customMapper.selectById(insOrder.getCompanyId()).getCode2();
insOrder.setEntrustCode(giveCode.giveCode("JCZX-" + code + "-", "ins_order", "-", "yyyyMMdd"));
insOrderMapper.insert(insOrder);
+ AtomicInteger count = new AtomicInteger();
list.forEach(a -> {
+ count.getAndIncrement();
a.setId(null);
a.setInsOrderId(insOrder.getId());
if (StrUtil.isEmpty(a.getSampleCode())) {
- a.setSampleCode(giveCode.giveCode("", "ins_sample", "", "yyMMdd"));
+ a.setSampleCode(giveCode.giveCode("", "ins_sample", "", "yyMMdd")+"-"+count.get());
}
insSampleMapper.insert(a);
if (ObjectUtil.isNotEmpty(a.getInsProduct())) {
@@ -168,12 +173,22 @@
}
}
});
+ for (List<Integer> i : pairing) {
+ SampleProductDto sample = JSON.parseObject(JSON.toJSONString(list.get(i.get(0))), SampleProductDto.class);
+ sample.setSampleCode(list.get(i.get(0)-1).getSampleCode() + "/" +list.get(i.get(1)-1).getSampleCode());
+ sample.setId(null);
+ insSampleMapper.insert(sample);
+ InsProduct insProduct = sample.getInsProduct().stream().filter(a -> Objects.equals(a.getInspectionItem(), "鐔旀帴鎹熻��")).findFirst().get();
+ insProduct.setId(null);
+ insProduct.setInsSampleId(sample.getId());
+ insProductMapper.insert(insProduct);
+ }
return insOrder.getId();
}
private void addInsProductMethod(Integer sampleId, List<InsProduct> productList, Integer id, Integer type) {
for (InsProduct product : productList) {
- if(product.getState()==1){
+ if(product.getState()==1 && !product.getInspectionItem().equals("鐔旀帴鎹熻��")){
switch (type){
case 1:
product.setInsFibersId(id);
diff --git a/inspect-server/src/main/resources/mapper/InsBushingMapper.xml b/inspect-server/src/main/resources/mapper/InsBushingMapper.xml
index a6f823a..014e4a4 100644
--- a/inspect-server/src/main/resources/mapper/InsBushingMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsBushingMapper.xml
@@ -17,7 +17,7 @@
<select id="selectFibersByBushingId" resultMap="FibersDto">
select
fs.id, fs.code, fs.model, fs.standard, fs.num, fs.ins_bushing_id,
- p.id pid, p.inspection_item, p.inspection_item_classify, p.inspection_item_subclass, p.factory, p.laboratory, p.sample_type, p.sample, p.model pmodel, p.son_laboratory, p.unit, p.price, p.man_hour, p.man_hour_group, p.inspection_item_type, p.inspection_value_type, p.device_group, p.checkout_number, p.section, p.value_type, p.method, p.man_day, p.bsm, p.ask, p.tell, p.`last_value`, p.ins_result, p.state, p.ins_sample_id, p.template_id, p.dic, p.method_s,
+ p.id pid, p.inspection_item, p.inspection_item_subclass, p.factory, p.laboratory, p.sample_type, p.sample, p.model pmodel, p.son_laboratory, p.unit, p.price, p.man_hour, p.man_hour_group, p.inspection_item_type, p.inspection_value_type, p.device_group, p.checkout_number, p.section, p.value_type, p.method, p.man_day, p.bsm, p.ask, p.tell, p.`last_value`, p.ins_result, p.state, p.ins_sample_id, p.template_id, p.dic, p.method_s,
ipr.ins_value,ipr.com_value,ipr.equip_value,ipr.equip_name
from ins_fibers fs
left join ins_product p on p.ins_fibers_id = fs.id
@@ -27,7 +27,7 @@
<select id="selectFiberByBushingId" resultMap="FiberDto">
select f.id, f.bush_color, f.color, f.model, f.standard, f.ins_bushing_id,
- p.id pid, p.inspection_item, p.inspection_item_classify, p.inspection_item_subclass, p.factory, p.laboratory, p.sample_type, p.sample, p.model pmodel, p.son_laboratory, p.unit, p.price, p.man_hour, p.man_hour_group, p.inspection_item_type, p.inspection_value_type, p.device_group, p.checkout_number, p.section, p.value_type, p.method, p.man_day, p.bsm, p.ask, p.tell, p.`last_value`, p.ins_result, p.state, p.ins_sample_id, p.template_id, p.dic, p.method_s,
+ p.id pid, p.inspection_item, p.inspection_item_subclass, p.factory, p.laboratory, p.sample_type, p.sample, p.model pmodel, p.son_laboratory, p.unit, p.price, p.man_hour, p.man_hour_group, p.inspection_item_type, p.inspection_value_type, p.device_group, p.checkout_number, p.section, p.value_type, p.method, p.man_day, p.bsm, p.ask, p.tell, p.`last_value`, p.ins_result, p.state, p.ins_sample_id, p.template_id, p.dic, p.method_s,
ipr.ins_value,ipr.com_value,ipr.equip_value,ipr.equip_name
from ins_fiber f
left join ins_product p on p.ins_fiber_id = f.id
@@ -37,7 +37,7 @@
<select id="selectFiberByFibersId" resultMap="FiberDto">
select f.id, f.bush_color, f.color, f.model, f.standard, f.ins_bushing_id,
- p.id pid, p.inspection_item, p.inspection_item_classify, p.inspection_item_subclass, p.factory, p.laboratory, p.sample_type, p.sample, p.model pmodel, p.son_laboratory, p.unit, p.price, p.man_hour, p.man_hour_group, p.inspection_item_type, p.inspection_value_type, p.device_group, p.checkout_number, p.section, p.value_type, p.method, p.man_day, p.bsm, p.ask, p.tell, p.`last_value`, p.ins_result, p.state, p.ins_sample_id, p.template_id, p.dic, p.method_s,
+ p.id pid, p.inspection_item, p.inspection_item_subclass, p.factory, p.laboratory, p.sample_type, p.sample, p.model pmodel, p.son_laboratory, p.unit, p.price, p.man_hour, p.man_hour_group, p.inspection_item_type, p.inspection_value_type, p.device_group, p.checkout_number, p.section, p.value_type, p.method, p.man_day, p.bsm, p.ask, p.tell, p.`last_value`, p.ins_result, p.state, p.ins_sample_id, p.template_id, p.dic, p.method_s,
ipr.ins_value,ipr.com_value,ipr.equip_value,ipr.equip_name
from ins_fiber f
left join ins_product p on p.ins_fiber_id = f.id
@@ -68,7 +68,6 @@
<resultMap id="product" type="com.yuanchu.mom.pojo.InsProduct">
<id property="id" column="pid" jdbcType="INTEGER"/>
<result property="inspectionItem" column="inspection_item" jdbcType="VARCHAR"/>
- <result property="inspectionItemClassify" column="inspection_item_classify" jdbcType="VARCHAR"/>
<result property="inspectionItemSubclass" column="inspection_item_subclass" jdbcType="VARCHAR"/>
<result property="factory" column="factory" jdbcType="VARCHAR"/>
<result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
--
Gitblit v1.9.3