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/RawInspectServiceImpl.java | 83 ++++++++++++++++++++++++++++++-----------
1 files changed, 60 insertions(+), 23 deletions(-)
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 3b863f5..5fac56c 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.*;
@@ -15,7 +16,6 @@
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-
import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
@@ -45,13 +45,14 @@
//鏂板鍘熸潗鏂欐楠屽崟-->鏍规嵁鍘熸潗鏂欑紪鐮佸緱鍒癷fs涓殑鎶ユ鏁版嵁
@Override
- public RawInspectVo chooseIFS(String code) {
- RawInspectVo rawInspectVo = new RawInspectVo();
+ public List<RawInspectVo> chooseIFS(String code) {
+ List<RawInspectVo> rawInspectVos = new ArrayList<>();
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 rawInspectVo = new RawInspectVo();
rawInspectVo.setCode(map.get("PART_NO").toString()); //鍘熸潗鏂欑紪鐮�
String[] split = map.get("PART_DESC").toString().split("锛�");
rawInspectVo.setName(split[0]); //鍘熸潗鏂欏悕绉�
@@ -60,24 +61,32 @@
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);
+ rawInspectVos.add(rawInspectVo);
+
+ //鏌ヨ璇ュ師鏉愭枡鏄惁鏈夋楠岄」鐩褰�
+ RawInspect rawInspect = rawInspectMapper.selOneByCode(code);
+ 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();
+ rawInsProductVo.setName(rawInsProduct.getName());
+ rawInsProductVo.setUnit(rawInsProduct.getUnit());
+ rawInsProductVo.setRequired(rawInsProduct.getRequired());
+ rawInsProductVo.setInternal(rawInsProduct.getInternal());
+ return rawInsProductVo;
+ }).collect(Collectors.toList());
+ rawInspectVo.setRawInsProducts(rawInsProductVos);
+ }
}
}
}
- //鏌ヨ璇ュ師鏉愭枡鏄惁鏈夋楠岄」鐩褰�
- RawInspect rawInspect = rawInspectMapper.selOneByCode(code);
- 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();
- rawInsProductVo.setName(rawInsProduct.getName());
- rawInsProductVo.setUnit(rawInsProduct.getUnit());
- rawInsProductVo.setRequired(rawInsProduct.getRequired());
- rawInsProductVo.setInternal(rawInsProduct.getInternal());
- return rawInsProductVo;
- }).collect(Collectors.toList());
- rawInspectVo.setRawInsProducts(rawInsProductVos);
- }
- return rawInspectVo;
+ return rawInspectVos;
}
//鏂板鍘熸潗鏂欐楠屽崟
@@ -149,7 +158,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,17 +183,45 @@
} 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 ="";
+ for (RawInsProduct rawInsProduct : rawInsProductList) {
+ msg=msg+rawInsProduct.getName()+"-";
+ }
InspectUnaccepted rawUnaccepted = InspectUnaccepted.builder()
- .reason(rawInspectMapper.selectById(id).getName() + "涓嶅悎鏍�") //鏆備笖瀹氫箟涓哄師鏉愭枡涓嶅悎鏍�
+ .reason(msg + "涓嶅悎鏍�") //瀹氫箟涓轰笉鍚堟牸鐨勯」鐩�+涓嶅悎鏍�
.number(number)
.rawInspectId(id)
- .dealReasult(1)
.type(0) //绫诲瀷涓哄師鏉愭枡
.build();
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();
}
--
Gitblit v1.9.3