From 9004d51f5b6096827b5c66b444729cb554997ec4 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 26 九月 2025 14:32:30 +0800
Subject: [PATCH] 原材料订单拆分功能调整v2
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java | 178 +++++++++-------------------------------------------------
1 files changed, 29 insertions(+), 149 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java
index 6bde534..1a7ce8c 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java
@@ -1,8 +1,6 @@
package com.ruoyi.inspect.service.impl;
-import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONUtil;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet;
@@ -11,7 +9,6 @@
import com.aspose.words.SaveFormat;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -25,12 +22,10 @@
import com.itextpdf.text.pdf.PdfContentByte;
import com.itextpdf.text.pdf.PdfReader;
import com.itextpdf.text.pdf.PdfStamper;
-import com.ruoyi.basic.dto.IfsInventoryQuantitySupplierDto;
import com.ruoyi.basic.mapper.IfsInventoryQuantityMapper;
import com.ruoyi.basic.pojo.IfsInventoryQuantity;
import com.ruoyi.common.constant.InsOrderTypeConstants;
import com.ruoyi.common.constant.MenuJumpPathConstants;
-import com.ruoyi.common.core.domain.Result;
import com.ruoyi.common.core.domain.entity.InformationNotification;
import com.ruoyi.common.config.WechatProperty;
import com.ruoyi.common.utils.*;
@@ -43,14 +38,18 @@
import com.ruoyi.inspect.service.InsOrderService;
import com.ruoyi.inspect.service.InsReportService;
import com.ruoyi.inspect.mapper.InsUnqualifiedHandlerMapper;
+import com.ruoyi.basic.vo.IfsInventoryQuantityVO;
+import com.ruoyi.inspect.service.RawMaterialOrderService;
import com.ruoyi.system.mapper.UserMapper;
import com.ruoyi.system.service.InformationNotificationService;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.xwpf.usermodel.*;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.io.ClassPathResource;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
@@ -116,6 +115,9 @@
private IfsApiUtils ifsApiUtils;
@Resource
private InsSampleUserMapper insSampleUserMapper;
+
+ @Autowired
+ private RawMaterialOrderService rawMaterialOrderService;
@Override
@@ -793,8 +795,10 @@
stamp.close();
}
- @Transactional(rollbackFor = Exception.class)
- public void isRawMaterial(InsOrder insOrder) {
+
+ @Override
+ @Transactional(rollbackFor = Exception.class,isolation = Isolation.READ_COMMITTED)
+ public void isRawMaterial(InsOrder insOrder,Boolean registerInsResults,Boolean hasExemption) {
IfsInventoryQuantity one = ifsInventoryQuantityMapper.selectOne(new LambdaQueryWrapper<IfsInventoryQuantity>()
.eq(IfsInventoryQuantity::getId, insOrder.getIfsInventoryId()));
if (Objects.isNull(one)) {
@@ -808,9 +812,25 @@
// 鍒ゆ柇鏄惁鏈変笉鍚堟牸
Long unqualifiedCount = getUnqualifiedCount(insOrder);
- if (count.equals(0L) && unqualifiedCount.equals(0L) && one.getIsFinish().equals(0) && one.getIsSource().equals(1)) {
+ if (count.equals(0L) && unqualifiedCount.equals(0L) && one.getIsFinish().equals(0) && one.getIsSource().equals(1) && registerInsResults) {
// 鍘熸潗鏂欑Щ搴�
- toLocation = this.moveRawMaterial(one);
+ //濡傛灉鏄媶鍒嗙殑璁㈠崟锛屽垯鎶婃媶鍒嗙殑鎵�鏈夋壒娆￠兘绉诲簱
+ if(one.getIsSplitOrder()==1 && !hasExemption){
+ //鏌ヨ鎷嗗垎璁㈠崟璇︽儏
+ List<IfsInventoryQuantityVO> ifsInventoryQuantityVOS = ifsInventoryQuantityMapper.selectSplitOrderList(one.getPartNo(), one.getLineNo(), one.getReleaseNo(), one.getReceiptNo(), one.getOrderNo());
+ for (IfsInventoryQuantityVO vo : ifsInventoryQuantityVOS) {
+ //濡傛灉鏈夊鎵樺崟淇℃伅涓斿悎鏍硷紝璧扮櫥璁板悗绉诲簱锛涘鏋滄病鏈夛紝鍒欒蛋鍏嶆锛涗笉鍚堟牸涓嶅仛澶勭悊
+ if(Objects.isNull(vo.getInsOrderId())){
+ rawMaterialOrderService.rawOrderRelease(vo.getId(), vo.getPartDesc());
+ }else if(Objects.equals(vo.getInsOrderId(),insOrder.getId())){
+ toLocation = insOrderService.moveRawMaterial(vo);
+ }else if(Objects.nonNull(vo.getInsResult()) && 1 == vo.getInsResult()){
+ toLocation = insOrderService.moveRawMaterial(vo);
+ }
+ }
+ }else{
+ toLocation = insOrderService.moveRawMaterial(one);
+ }
}
// 鍒ゆ柇缁撴潫鐘舵�佷慨鏀瑰悎鏍肩姸鎬�
@@ -898,75 +918,6 @@
}
/**
- * ifs绉诲簱鎿嶄綔
- * @param one
- * @return
- */
- @Override
- public String moveRawMaterial(IfsInventoryQuantity one) {
- String toLocation;
- // 鐧昏閲囪喘妫�楠岀粨鏋淪TD
- if (one.getIsRegister().equals(0)) {
- Map<String, Object> resultMap = new HashMap<>();
- List<Map<String, Object>> resultList = new ArrayList<>();
- Map<String, Object> map = new HashMap<>();
- map.put("ORDER_NO", one.getOrderNo()); // 閲囪喘璁㈠崟鍙�
- map.put("LINE_NO", one.getLineNo()); // 琛屽彿
- map.put("RELEASE_NO", one.getReleaseNo()); // 涓嬭揪鍙�
- map.put("RECEIPT_NO", one.getReceiptNo()); // 鎺ユ敹鍙�
- map.put("PURCH_QTY", one.getQtyToInspect()); // 瑕佹楠岀殑閲囪喘鏁伴噺
- resultList.add(map);
- resultMap.put("RECORD_ID", UUID.randomUUID().toString());
- resultMap.put("SYSCODE", "LIMS");
- resultMap.put("SYSMODEL", "鐧昏閲囪喘妫�楠岀粨鏋�");
- resultMap.put("BATCH_INFO", resultList);
- Result result = ifsApiUtils.getProcurementResults(JSONUtil.toJsonStr(resultMap));
- if (result.getCode() != 200) {
- throw new ErrorException("IFS鐧昏閲囪喘妫�楠岀粨鏋滃け璐�: " + result.getMessage());
- }
- }
- insOrderService.updateIfsInventoryQuantity(one.getId());
- /**
- * TODO 鍚庣画闇�瑕佽皟鐢↖FS鐨勬帴鍙� 绉诲叆鐨勫簱浣嶅彿 toLocation
- */
- // 妫�楠屽悗绉诲簱
- toLocation = "1301";
- Map<String, Object> moveResultMap = new HashMap<>();
- List<Map<String, Object>> moveResultList = new ArrayList<>();
- Map<String, Object> moveMap = new HashMap<>();
- moveMap.put("ORDER_NO", one.getOrderNo()); // 閲囪喘璁㈠崟鍙�
- moveMap.put("LINE_NO", one.getLineNo());
- moveMap.put("RELEASE_NO", one.getReleaseNo());
- moveMap.put("RECEIPT_NO", one.getReceiptNo());
- moveMap.put("PART_NO", one.getPartNo());
- moveMap.put("QTY", one.getQtyArrived());
- moveMap.put("LOCATION_NO", one.getLocationNo());
- moveMap.put("TO_LOCATION_NO", toLocation);
- moveMap.put("LOT_BATCH_NO", one.getLotBatchNo());
- moveMap.put("SERIAL_NO", one.getSerialNo());
- moveMap.put("WAIV_DEV_REJ_NO", one.getWaivDevRejNo());
- moveMap.put("ENG_CHG_LEVEL", one.getEngChgLevel());
- moveMap.put("ACTIVITY_SEQ", one.getActivitySeq());
- moveResultList.add(moveMap);
- moveResultMap.put("RECORD_ID", UUID.randomUUID().toString());
- moveResultMap.put("SYSCODE", "LIMS");
- moveResultMap.put("SYSMODEL", "妫�楠屽悗绉诲簱");
- moveResultMap.put("BATCH_INFO", moveResultList);
-
- Result result1 = ifsApiUtils.moveReceipt(JSONUtil.toJsonStr(moveResultMap));
- // 濡傛灉鏈夊繀椤讳负闆朵欢鎸囧畾鎵瑰彿鎶ラ敊闇�瑕侀噸鏂版彁浜ょЩ搴撲俊鎭幓鎸囧畾鎵瑰彿
- if (result1.getCode() != 200) {
- String message = result1.getMessage();
- if (message.contains("蹇呴』涓洪浂浠�") && message.contains("鎸囧畾鎵瑰彿")) {
- updaeBatch(one, toLocation);
- } else {
- throw new ErrorException("IFS妫�楠屽悗绉诲簱澶辫触: " + result1.getMessage());
- }
- }
- return toLocation;
- }
-
- /**
* 閫�鍥炲埌妫�楠屼换鍔�
* @param id
* @return
@@ -1035,77 +986,6 @@
throw new RuntimeException("瀵煎嚭澶辫触");
}
-
- }
-
-
- /**
- * 鍏堜慨鏀归噰璐鍗曟壒娆″彿, 鍚庤繘琛岀Щ搴撴搷浣�
- * @param one
- * @param toLocation
- */
- private void updaeBatch(IfsInventoryQuantity one, String toLocation) {
- if (one.getIsUpdateBatch().equals(0)) {
- // 鍏堜慨鏀规壒娆″彿鍚庤繘琛岀Щ搴�
- Map<String, Object> resultMap = new HashMap<>();
- List<Map<String, Object>> resultList = new ArrayList<>();
- Map<String, Object> map = new HashMap<>();
- map.put("ORDER_NO", one.getOrderNo()); // 閲囪喘璁㈠崟鍙�
- map.put("LINE_NO", one.getLineNo()); // 琛屽彿
- map.put("RELEASE_NO", one.getReleaseNo()); // 涓嬭揪鍙�
- map.put("RECEIPT_NO", one.getReceiptNo()); // 鎺ユ敹鍙�
- map.put("PART_NO", one.getPartNo()); //闆朵欢鍙�
- map.put("CONFIGURATION_ID", one.getConfigurationId()); // 閰嶇疆鏍囪瘑
- map.put("LOCATION_NO", one.getLocationNo()); // 搴撲綅鍙�
- map.put("LOT_BATCH_NO", one.getLotBatchNo());// 鎵规鍙�
- map.put("NEW_LOT_BATCH_NO", one.getUpdateBatchNo()); // 鐩爣鎵规鍙�
- map.put("SERIAL_NO", one.getSerialNo()); // 搴忓垪鍙�
- map.put("ENG_CHG_LEVEL", one.getEngChgLevel()); // 鐗堟湰鍙�
- map.put("WAIV_DEV_REJ_NO", one.getWaivDevRejNo()); // wdr鍙�
- map.put("ACTIVITY_SEQ", one.getActivitySeq()); // 娲诲姩搴忓彿
- map.put("QTY_TO_CHANGE", one.getQtyArrived()); // 鍙樻洿鏁伴噺
- resultList.add(map);
- resultMap.put("RECORD_ID", UUID.randomUUID().toString());
- resultMap.put("SYSCODE", "LIMS");
- resultMap.put("SYSMODEL", "淇敼閲囪喘璁㈠崟鎵规鍙�");
- resultMap.put("BATCH_INFO", resultList);
-
- Result result = ifsApiUtils.updateMoveReceiptLot(JSONUtil.toJsonStr(resultMap));
-
- if (result.getCode() != 200) {
- throw new ErrorException("IFS淇敼鎵规鍙峰け璐�: " + result.getMessage());
- }
- ifsInventoryQuantityMapper.update(null, Wrappers.<IfsInventoryQuantity>lambdaUpdate()
- .set(IfsInventoryQuantity::getIsUpdateBatch, 1)
- .eq(IfsInventoryQuantity::getId, one.getId()));
- }
-
- Map<String, Object> moveResultMap = new HashMap<>();
- List<Map<String, Object>> moveResultList = new ArrayList<>();
- Map<String, Object> moveMap = new HashMap<>();
- moveMap.put("ORDER_NO", one.getOrderNo()); // 閲囪喘璁㈠崟鍙�
- moveMap.put("LINE_NO", one.getLineNo());
- moveMap.put("RELEASE_NO", one.getReleaseNo());
- moveMap.put("RECEIPT_NO", one.getReceiptNo());
- moveMap.put("PART_NO", one.getPartNo());
- moveMap.put("QTY", one.getQtyArrived());
- moveMap.put("LOCATION_NO", one.getLocationNo());
- moveMap.put("TO_LOCATION_NO", toLocation);
- moveMap.put("LOT_BATCH_NO", one.getUpdateBatchNo());
- moveMap.put("SERIAL_NO", one.getSerialNo());
- moveMap.put("WAIV_DEV_REJ_NO", one.getWaivDevRejNo());
- moveMap.put("ENG_CHG_LEVEL", one.getEngChgLevel());
- moveMap.put("ACTIVITY_SEQ", one.getActivitySeq());
- moveResultList.add(moveMap);
- moveResultMap.put("RECORD_ID", UUID.randomUUID().toString());
- moveResultMap.put("SYSCODE", "LIMS");
- moveResultMap.put("SYSMODEL", "妫�楠屽悗绉诲簱");
- moveResultMap.put("BATCH_INFO", moveResultList);
-
- Result result1 = ifsApiUtils.moveReceipt(JSONUtil.toJsonStr(moveResultMap));
- if (result1.getCode() != 200) {
- throw new ErrorException("IFS妫�楠屽悗绉诲簱澶辫触: " + result1.getMessage());
- }
}
--
Gitblit v1.9.3