From a3f47b5e065878e5f41699ac1c597fd9ac9c4a21 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 25 九月 2023 14:56:24 +0800
Subject: [PATCH] 修改3.0 9.25
---
inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectUnacceptedMapper.java | 3 -
inspect-server/src/main/java/com/yuanchu/mom/service/impl/ProcessInspectServiceImpl.java | 13 +++
inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml | 32 ----------
inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java | 46 +++++++++++++-
inspect-server/src/main/java/com/yuanchu/mom/service/RawInsProductService.java | 1
inspect-server/src/main/java/com/yuanchu/mom/service/impl/FinishedInspectServiceImpl.java | 11 +++
inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java | 13 ----
inspect-server/src/main/java/com/yuanchu/mom/pojo/vo/RawInspectVo.java | 5 +
inspect-server/src/main/java/com/yuanchu/mom/pojo/RawInspect.java | 5 +
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java | 25 +++++++-
10 files changed, 95 insertions(+), 59 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectUnacceptedMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectUnacceptedMapper.java
index 04cd708..69282f8 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectUnacceptedMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectUnacceptedMapper.java
@@ -20,8 +20,5 @@
//鍒嗛〉鏌ヨ涓嶅悎鏍煎搧澶勭疆
IPage<Map<String, Object>> selectDisposal(Page<Object> page, String specificationModel, String productName, Integer productCategories, Integer state);
- //鏍规嵁Id鏌ヨ鍘熸潗鏂欐楠屼俊鎭�
- RawInspectVo editDisposalOpinionConfirmation(Integer rawUnacceptedId);
-
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/RawInspect.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/RawInspect.java
index 641d16d..ff6c266 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/RawInspect.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/RawInspect.java
@@ -82,6 +82,11 @@
*/
private String userName;
+ /**
+ * IFS涓鐗╂枡鐨勫叾浠栦俊鎭�
+ */
+ private String message;
+
@ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
private Integer state;
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/vo/RawInspectVo.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/vo/RawInspectVo.java
index d2183e0..faf4a3e 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/vo/RawInspectVo.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/vo/RawInspectVo.java
@@ -76,6 +76,11 @@
@JsonSerialize
private String userName;
+ /**
+ * IFS涓鐗╂枡鐨勫叾浠栦俊鎭�
+ */
+ private String message;
+
/* 妫�楠岄」鐩� */
@JsonSerialize
private List<RawInsProductVo> rawInsProducts;
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/RawInsProductService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/RawInsProductService.java
index 1634097..19c00f5 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/RawInsProductService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/RawInsProductService.java
@@ -30,6 +30,5 @@
*/
void updateDevByRpId(Integer rpId, Integer devId);
- void batchAddInsProduct(Integer id, List<RawInsProductVo> rawInsProducts);
}
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 d06c736..82186ab 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
@@ -124,8 +124,17 @@
} 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 = null;
+ for (InspectionItem inspectionItem : inspectionItemList) {
+ msg += inspectionItem.getName();
+ }
InspectUnaccepted finishUnaccepted = InspectUnaccepted.builder()
- .reason(finishedInspect.getMaterial() + "涓嶅悎鏍�") //鏆備笖瀹氫箟涓轰骇鍝佸悕绉颁笉鍚堟牸
+ .reason(msg + "涓嶅悎鏍�") //鏆備笖瀹氫箟涓洪」鐩�+涓嶅悎鏍�
.number(number)
.rawInspectId(id)
.type(1) //绫诲瀷涓烘垚鍝佹楠�
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java
index 3da8183..314bdee 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.mapper.InspectUnacceptedMapper;
import com.yuanchu.mom.mapper.InspectionItemMapper;
+import com.yuanchu.mom.mapper.RawInsProductMapper;
import com.yuanchu.mom.pojo.*;
import com.yuanchu.mom.pojo.dto.InspectionItemDto;
import com.yuanchu.mom.pojo.vo.RawInspectVo;
@@ -42,6 +43,9 @@
//鍘熸潗鏂欐楠屽瓙鏁版嵁
@Autowired
private RawInsProductService rawInsProductService;
+
+ @Resource
+ RawInsProductMapper rawInsProductMapper;
//浜у搧妫�楠�
@Autowired
@@ -87,13 +91,26 @@
// 绛変簬0锛氬師鏉愭枡
if (type == 0) {
// 鏍规嵁Id鏌ヨ鍘熸潗鏂欐楠屼俊鎭�
- RawInspectVo map = inspectUnacceptedMapper.editDisposalOpinionConfirmation(rawUnacceptedId);
- RawInspect rawInspect = new RawInspect();
- BeanUtils.copyProperties(map, rawInspect);
+ RawInspect rawInspect = rawInspectService.getById(inspectUnaccepted.getRawInspectId());
+ List<RawInsProduct> rawInsProductList = rawInsProductMapper.selectList(Wrappers.<RawInsProduct>query()
+ .eq("raw_inspect_id", rawInspect.getId()));
// 淇濆瓨鐖剁骇
+ rawInspect.setId(null);
+ rawInspect.setInsState(0);
+ rawInspect.setJudgeState(null);
+ rawInspect.setInsTime(null);
rawInspectService.save(rawInspect);
// 鎵归噺淇濆瓨瀛愮骇
- rawInsProductService.batchAddInsProduct(rawInspect.getId(), map.getRawInsProducts());
+ List<RawInsProduct> rawInsProducts = rawInsProductList.stream().map(rawInsProduct -> {
+ rawInsProduct.setId(null);
+ rawInsProduct.setTestValue(null);
+ rawInsProduct.setTestState(null);
+ rawInsProduct.setDeviceId(null);
+ rawInsProduct.setRawInspectId(rawInspect.getId());
+ rawInsProduct.setUserId(null);
+ return rawInsProduct;
+ }).collect(Collectors.toList());
+ rawInsProductService.saveBatch(rawInsProducts);
}
// 绛変簬1锛氫骇鍝佹楠�(鍗婃垚鍝�)
else if (type == 1) {
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/ProcessInspectServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/ProcessInspectServiceImpl.java
index 7bb7f00..2d88f58 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/ProcessInspectServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/ProcessInspectServiceImpl.java
@@ -76,7 +76,7 @@
//涓婃姤(鏇存柊妫�楠岀姸鎬�)
@Override
@Transactional(rollbackFor = Exception.class)
- public String updateProcessInspectsById(Integer id,Integer number) {
+ public String updateProcessInspectsById(Integer id, Integer number) {
/*鏇存柊妫�楠屽崟閲岄潰鐨勬楠岀粨璁�*/
//鍏堝垽鏂楠岀粨鏋�
List<Integer> results = inspectionItemMapper.getResult(id, 1);
@@ -98,8 +98,17 @@
} else return "椤圭洰鏈楠屽畬!";
/*濡傛灉妫�楠岀粨璁轰负涓嶅悎鏍�,鍒欓渶瑕佹柊澧炰笉鍚堟牸妫�楠屽崟*/
if (processInspect.getResult() == 0) {
+ //鏌ヨ璇ユ楠屽崟鍝簺妫�楠岄」鐩笉鍚堟牸
+ List<InspectionItem> inspectionItemList = inspectionItemMapper.selectList(Wrappers.<InspectionItem>query()
+ .eq("inspect_id", id)
+ .eq("result", 0)
+ .eq("type", 1));
+ String msg = null;
+ for (InspectionItem inspectionItem : inspectionItemList) {
+ msg += inspectionItem.getName();
+ }
InspectUnaccepted processUnaccepted = InspectUnaccepted.builder()
- .reason(processInspect.getMaterial() + processInspect.getTechname() + "涓嶅悎鏍�") //鏆備笖瀹氫箟涓轰骇鍝佸悕绉�+宸ヨ壓涓嶅悎鏍�
+ .reason(processInspect.getTechname() + msg + "涓嶅悎鏍�") //瀹氫箟涓哄伐鑹�+椤圭洰涓嶅悎鏍�
.number(number)
.rawInspectId(id)
.type(2) //绫诲瀷涓鸿繃绋嬫楠�
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java
index 7d32d42..0c0cb88 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java
@@ -88,19 +88,6 @@
rawInsProductMapper.update(new RawInsProduct(), updateWrapper);
}
- @Override
- public void batchAddInsProduct(Integer id, List<RawInsProductVo> rawInsProducts) {
- List<RawInsProduct> rawInsProductList = new ArrayList<>();
- rawInsProducts.forEach(i -> {
- RawInsProduct rawInsProduct1 = new RawInsProduct();
- BeanUtils.copyProperties(i, rawInsProduct1);
- rawInsProduct1.setRawInspectId(id);
- rawInsProduct1.setState(1);
- rawInsProductList.add(rawInsProduct1);
- });
- rawInsProductMapper.insertBatchSomeColumn(rawInsProductList);
- }
-
/*鍒ゆ柇妫�娴嬪�兼槸鍚︽弧瓒虫爣鍑嗗�煎拰鍐呮帶鍊肩殑瑕佹眰,濡傛灉涓嶆弧瓒冲垯妫�楠岀粨璁轰负涓嶅悎鏍�*/
//濡傛灉鏄辩殑鎿嶄綔
private int conValues(String standardValueStr, String controlValueStr, String detectionValueStr) {
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
index b5923e3..fa413d5 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.mom.Task.BatchInfo;
import com.yuanchu.mom.Task.SyncOrder;
import com.yuanchu.mom.mapper.*;
import com.yuanchu.mom.pojo.*;
@@ -49,7 +50,7 @@
RawInspectVo rawInspectVo = new RawInspectVo();
List<Map<String, Object>> mapList = SyncOrder.ifsInterfaces();
for (Map<String, Object> map : mapList) {
- //todo: 鍚庣画闇�瑕佸皢鐘舵�佹敼鎴愬緟妫�楠�
+ // todo: 鍚庣画闇�瑕佸皢鐘舵�佹敼鎴愬緟妫�楠�
if (map.get("STATE").equals("宸叉帴鏀�")) {
if (map.get("PART_NO").toString().equals(code)) {
rawInspectVo.setCode(map.get("PART_NO").toString()); //鍘熸潗鏂欑紪鐮�
@@ -60,12 +61,18 @@
rawInspectVo.setNumber(Integer.parseInt(String.valueOf(map.get("QTY_TO_INSPECT")))); //鏁伴噺
rawInspectVo.setFormTime(DateUtil.parse(map.get("APPROVED_DATE").toString())); //鏉ユ枡鏃ユ湡
rawInspectVo.setSupplier(map.get("SUPPLIER_NAME").toString()); //渚涘簲鍟�
+ String orderNo = map.get("ORDER_NO").toString();//璁㈠崟鍙�
+ String releaseNo = map.get("RELEASE_NO").toString();//涓嬭揪鍙�
+ String lineNo = map.get("LINE_NO").toString();//琛屽彿
+ String lotBatchNo = map.get("LOT_BATCH_NO").toString();//鎵瑰彿
+ String locationNo = map.get("LOCATION_NO").toString();//搴撲綅鍙�
+ rawInspectVo.setMessage(orderNo+","+releaseNo+","+lineNo+","+lotBatchNo+","+locationNo);
}
}
}
//鏌ヨ璇ュ師鏉愭枡鏄惁鏈夋楠岄」鐩褰�
RawInspect rawInspect = rawInspectMapper.selOneByCode(code);
- if (ObjectUtils.isNotEmpty(rawInspect)){
+ if (ObjectUtils.isNotEmpty(rawInspect)) {
List<RawInsProduct> rawInsProductList = rawInsProductMapper.selectList(Wrappers.<RawInsProduct>query().eq("raw_inspect_id", rawInspect.getId()));
List<RawInsProductVo> rawInsProductVos = rawInsProductList.stream().map(rawInsProduct -> {
RawInsProductVo rawInsProductVo = new RawInsProductVo();
@@ -149,7 +156,7 @@
//鏇存柊妫�楠岀姸鎬�(涓婃姤)
@Override
@Transactional(rollbackFor = Exception.class)
- public String updateRawInspectsById(Integer id,Integer number) {
+ public String updateRawInspectsById(Integer id, Integer number) {
/*鏇存柊妫�楠屽崟閲岄潰鐨勬楠岀粨璁�*/
//鍏堝垽鏂楠岀粨鏋�
List<Integer> results = rawInsProductMapper.getresult(id);
@@ -174,8 +181,16 @@
} else return "椤圭洰鏈楠屽畬!";
/*濡傛灉妫�楠岀粨璁轰负涓嶅悎鏍�,鍒欓渶瑕佹柊澧炰笉鍚堟牸妫�楠屽崟*/
if (rawInspect.getJudgeState() == 0) {
+ //鏌ヨ璇ユ楠屽崟鍝簺妫�楠岄」鐩笉鍚堟牸
+ List<RawInsProduct> rawInsProductList = rawInsProductMapper.selectList(Wrappers.<RawInsProduct>query()
+ .eq("raw_inspect_id", id)
+ .eq("test_state", 0));
+ String msg = null;
+ for (RawInsProduct rawInsProduct : rawInsProductList) {
+ msg+=rawInsProduct.getName();
+ }
InspectUnaccepted rawUnaccepted = InspectUnaccepted.builder()
- .reason(rawInspectMapper.selectById(id).getName() + "涓嶅悎鏍�") //鏆備笖瀹氫箟涓哄師鏉愭枡涓嶅悎鏍�
+ .reason(msg + "涓嶅悎鏍�") //瀹氫箟涓轰笉鍚堟牸鐨勯」鐩�+涓嶅悎鏍�
.number(number)
.rawInspectId(id)
.type(0) //绫诲瀷涓哄師鏉愭枡
@@ -183,7 +198,28 @@
inspectUnacceptedMapper.insert(rawUnaccepted);
}
/*妫�楠屽畬鎴愬悗锛屾棤璁哄悎鏍间笌鍚︼紝灏咺FS鎶ユ鐘舵�佹洿鏀逛负宸叉帴鏀�*/
-
+ //鏍规嵁妫�楠屽崟id鏌ヨ鍘熸潗鏂欐楠屽崟
+ RawInspect rawIns = rawInspectMapper.selectById(id);
+ String[] split = rawIns.getMessage().split(",");
+ BatchInfo batchInfo = new BatchInfo();
+ batchInfo.setOrderNo(split[0]);
+ batchInfo.setReleaseNo(split[1]);
+ batchInfo.setLineNo(split[2]);
+ batchInfo.setPartNo(rawIns.getCode());
+ batchInfo.setLotBatchNo(split[3]);
+ batchInfo.setLocationNo(split[4]);
+ if (ObjectUtils.isEmpty(number)) {
+ //濡傛灉涓嶅悎鏍肩殑鏁伴噺涓虹┖null
+ number=0;
+ }
+ batchInfo.setQtyToReceive(rawIns.getNumber()-number); //瑕佹帴鏀剁殑鏁伴噺
+ batchInfo.setQtyToInspect(rawIns.getNumber()); //瑕佹楠岀殑鏁伴噺
+ batchInfo.setReceiveCase("鎺ユ敹鍒版潵鏂欏尯");
+ List<BatchInfo> batchInfos = Arrays.asList(batchInfo);
+ //鍙戦�両FS璇锋眰
+ String s = SyncOrder.importPolReceive(batchInfos);
+ System.out.println(s);
+ System.out.println("'''''''''''''''''''''''");
return rawInspect.getJudgeState().toString();
}
diff --git a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
index 4822821..1a40c56 100644
--- a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.yuanchu.mom.mapper.InspectUnacceptedMapper">
-
<!--涓嶅悎鏍煎缃�-->
<select id="selectDisposal" resultType="map">
SELECT i.`id`, s.`type`, s.name productName, s.`specifications`, i.number, i.`tell` description,
- i.`tell` opinions, s.user_name, DATE_FORMAT(i.`create_time`, '%Y-%m-%d') `date`, i.`deal_state`, i.way, i.faulty_materials, i.opinion_tell
+ i.`tell` opinions, s.user_name, DATE_FORMAT(i.`create_time`, '%Y-%m-%d') `date`, i.`deal_state`, i.way,
+ i.faulty_materials, i.opinion_tell,faulty_materials,reason
FROM mom_ocean.inspect_unaccepted i
LEFT JOIN
(
@@ -56,33 +56,5 @@
AND s.`type` = #{productCategories}
</if>
ORDER BY i.`update_time` DESC
- </select>
-
- <resultMap id="editDisposalOpinionConfirmationMap" type="com.yuanchu.mom.pojo.vo.RawInspectVo">
- <id property="code" column="code"/>
- <result property="unit" column="unit"/>
- <result property="name" column="name"/>
- <result property="specifications" column="specifications"/>
- <result property="formTime" column="form_time"/>
- <result property="number" column="number"/>
- <result property="supplier" column="supplier"/>
- <result property="userName" column="user_name"/>
- <collection property="rawInsProducts" ofType="com.yuanchu.mom.pojo.vo.RawInsProductVo">
- <result property="name" column="pNmae"/>
- <result property="unit" column="pUnit"/>
- <result property="required" column="required"/>
- <result property="deviceId" column="device_id"/>
- <result property="internal" column="internal"/>
- <result property="testValue" column="test_value"/>
- </collection>
- </resultMap>
-
- <select id="editDisposalOpinionConfirmation" resultMap="editDisposalOpinionConfirmationMap">
- select r.`form_time`, r.`specifications`, r.`code`, r.`name`, r.`unit`, r.`number`, r.`supplier`, r.`user_name`, p.`name` pNmae, p.`unit` pUnit,
- p.`required`,p.`internal`, p.`test_value`, p.`device_id`
- from (mom_ocean.inspect_unaccepted i, mom_ocean.raw_inspect r)
- left join mom_ocean.raw_ins_product p on r.`id` = p.`raw_inspect_id`
- where i.`id` = #{rawUnacceptedId}
- and i.`raw_inspect_id` = r.`id`
</select>
</mapper>
--
Gitblit v1.9.3