From 124ecca15d3c5d6dcefa9a27aaa3c07c556674e9 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 30 七月 2024 12:34:42 +0800
Subject: [PATCH] PK8000逻辑处理
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
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 c9689b7..1b61451 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
@@ -122,7 +122,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public int upInsOrder(Integer orderId, Integer sampleId, String appointed, Integer userId) {
+ public int upInsOrder(Integer orderId, Integer sampleId, String appointed, Integer userId,String sonLaboratory) {
InsOrder insOrder = new InsOrder();
insOrder.setId(orderId);
insOrder.setAppointed(LocalDate.parse(appointed));
@@ -147,6 +147,7 @@
insSampleUser.setState(0);
insSampleUser.setUserId(userId);
insSampleUser.setInsSampleId(orderId);
+ insSampleUser.setSonLaboratory(sonLaboratory);
insSampleUserMapper.insert(insSampleUser);
}
return 1;
@@ -158,7 +159,7 @@
insOrder.setState(0);
String code = customMapper.selectById(insOrder.getCompanyId()).getCode2();
//insOrder.setEntrustCode(giveCode.giveCode("JCZX-" + code + "-", "ins_order", "", "yyMMdd"));
- String giveCode = this.giveCode.giveCode("JCZX-" + code + "-", "ins_order", "", "yyMMdd");
+ String giveCode = this.giveCode.giveCode("JCZX-" + code + "-", "ins_sample", "", "yyMMdd");
insOrderMapper.insert(insOrder);
AtomicInteger count = new AtomicInteger();
list.forEach(a -> {
@@ -372,21 +373,16 @@
insProduct.setManHourGroup(product.getManHourGroup());
insProduct.setInspectionItemType("0");
insProduct.setInspectionValueType("1");
+ if (product.getInspectionItem().equals("鐑惊鐜�")) {
+ insProduct.setInspectionItemClass("鐩存祦鐢甸樆");//妫�楠屽瓙瀛愰」--鐩存祦鐢甸樆
+ insProduct.setInspectionItemClassEn("DC resistance");//妫�楠屽瓙瀛愰」鑻辨枃--鐩存祦鐢甸樆
+ insProduct.setUnit("惟/km");//鍗曚綅
+ }
insProducts.add(insProduct);
+ insProductes.add(insProduct);
+ insProductess.add(insProduct);
}
//鐑惊鐜墠鏈夊娆″惊鐜鏁�
- if (product.getInspectionItem().equals("鐑惊鐜�")) {
- //鐑惊鐜繕瑕佸姞涓婄洿娴佺數闃�
- for (InsProduct insProduct : insProducts) {
- InsProduct insProduct1 = new InsProduct();
- BeanUtils.copyProperties(insProduct, insProduct1);
- insProduct1.setInspectionItemClass("鐩存祦鐢甸樆");//妫�楠屽瓙瀛愰」--鐩存祦鐢甸樆
- insProduct1.setInspectionItemClassEn("DC resistance");//妫�楠屽瓙瀛愰」鑻辨枃--鐩存祦鐢甸樆
- insProduct1.setUnit("惟/km");//鍗曚綅
- insProductes.add(insProduct1);
- insProductess.add(insProduct1);
- }
- }
if (count > 1) {
//寰幆瓒呰繃1娆�
for (int j = 2; j <= count; j++) {
--
Gitblit v1.9.3