From e1284aa3b1b400ecebb59126d7110a3bb4a6b000 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 31 十月 2025 15:46:09 +0800
Subject: [PATCH] 原材料报检拆分功能V1
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java | 181 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 170 insertions(+), 11 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
index ebaac84..50a5633 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
@@ -1,14 +1,18 @@
package com.ruoyi.inspect.service.impl;
+import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.support.ExcelTypeEnum;
import com.alibaba.excel.write.metadata.WriteSheet;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -25,16 +29,22 @@
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.WxCpUtils;
+import com.ruoyi.common.utils.api.IfsApiUtils;
import com.ruoyi.inspect.dto.CopperInsOrderDto;
+import com.ruoyi.inspect.dto.OrderSplitDTO;
import com.ruoyi.inspect.dto.RawMaterialStandardTreeDto;
import com.ruoyi.basic.mapper.IfsInventoryQuantityMapper;
import com.ruoyi.basic.mapper.StandardTreeMapper;
import com.ruoyi.inspect.dto.SampleProductDto;
+import com.ruoyi.inspect.excel.OrderSplitExcelData;
+import com.ruoyi.inspect.excel.OrderSplitExcelListener;
import com.ruoyi.inspect.mapper.InsOrderMapper;
import com.ruoyi.inspect.mapper.InsProductMapper;
import com.ruoyi.inspect.mapper.InsSampleMapper;
+import com.ruoyi.inspect.pojo.IfsSplitOrderRecord;
import com.ruoyi.inspect.pojo.InsOrder;
import com.ruoyi.inspect.pojo.InsReport;
+import com.ruoyi.inspect.service.IfsSplitOrderRecordService;
import com.ruoyi.inspect.service.InsOrderService;
import com.ruoyi.inspect.service.InsReportService;
import com.ruoyi.inspect.service.RawMaterialOrderService;
@@ -46,18 +56,24 @@
import lombok.AllArgsConstructor;
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;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
/**
* @Author zhuo
@@ -79,6 +95,10 @@
private ThreadPoolTaskExecutor threadPoolTaskExecutor;
private InsProductMapper insProductMapper;
private AuxiliaryOutputWorkingHoursMapper auxiliaryOutputWorkingHoursMapper;
+ private IfsApiUtils ifsApiUtils;
+
+ private IfsSplitOrderRecordService ifsSplitOrderRecordService;
+
@Override
@@ -142,7 +162,7 @@
* @return
*/
@Override
- public int inspectionReport(List<Integer> ids) {
+ public int inspectionReport(List<Long> ids) {
Integer userId = SecurityUtils.getUserId().intValue();
ifsInventoryQuantityMapper.update(null, Wrappers.<IfsInventoryQuantity>lambdaUpdate()
.in(IfsInventoryQuantity::getId, ids)
@@ -185,7 +205,7 @@
* @return
*/
@Override
- public int revokeInspectionReport(Integer id) {
+ public int revokeInspectionReport(Long id) {
return ifsInventoryQuantityMapper.update(null, Wrappers.<IfsInventoryQuantity>lambdaUpdate()
.eq(IfsInventoryQuantity::getId, id)
.set(IfsInventoryQuantity::getIsInspect, 0)
@@ -248,7 +268,7 @@
* @return
*/
@Override
- public boolean repealRawOrder(Integer ifsInventoryId) {
+ public boolean repealRawOrder(Long ifsInventoryId) {
// 鏌ヨ鍒ゆ柇鏄惁鏄摐鍗曚笣
IfsInventoryQuantity ifsInventoryQuantity = ifsInventoryQuantityMapper.selectById(ifsInventoryId);
if (ifsInventoryQuantity.getIsCopper() != null && ifsInventoryQuantity.getIsCopper().equals(1)) {
@@ -338,7 +358,7 @@
addAuxiliary(insOrder, ifsInventoryQuantity);
// todo: ifs鐩存帴绉诲簱
- insReportService.isRawMaterial(insOrder);
+ insReportService.isRawMaterial(insOrder,true,true);
return insOrder.getId();
}
@@ -390,7 +410,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean rawOrderRelease(Integer ifsInventoryId, String partDetail) {
+ public boolean rawOrderRelease(Long ifsInventoryId, String partDetail) {
// 淇敼鍘熸潗鏂欐暟鎹洿鎺ヤ负宸叉楠�
ifsInventoryQuantityMapper.update(null, new LambdaUpdateWrapper<IfsInventoryQuantity>()
.set(IfsInventoryQuantity::getState, 2)
@@ -432,7 +452,7 @@
addAuxiliary(insOrder, ifsInventoryQuantity);
// todo: ifs鐩存帴绉诲簱
- insReportService.isRawMaterial(insOrder);
+ insReportService.isRawMaterial(insOrder,true,true);
return true;
}
@@ -444,7 +464,7 @@
* @return
*/
@Override
- public int notificationRawOrder(Integer ifsInventoryId) {
+ public int notificationRawOrder(Long ifsInventoryId) {
IfsInventoryQuantity ifsInventory = ifsInventoryQuantityMapper.selectById(ifsInventoryId);
// 鏌ヨ褰撳墠鎵规, 渚涘簲鍟�, 闆朵欢鍙风殑鍘熸潗鏂欐槸鍚﹁秴杩囦簡20鍚�, 瓒呰繃浜�20鍚ㄩ渶瑕佽繘琛屽娆℃楠屾彁閱�
List<IfsInventoryQuantity> quantityList = ifsInventoryQuantityMapper.selectList(Wrappers.<IfsInventoryQuantity>lambdaQuery()
@@ -570,7 +590,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean concessionRelease(Integer ifsInventoryId) {
+ public boolean concessionRelease(Long ifsInventoryId) {
// 鏌ヨ鍘熸潗鏂欎俊鎭�
IfsInventoryQuantity ifsInventoryQuantity = ifsInventoryQuantityMapper.selectById(ifsInventoryId);
if (!ifsInventoryQuantity.getInspectStatus().equals(2)) {
@@ -578,7 +598,7 @@
}
// todo:闇�瑕佸垽鏂璷a娴佺▼鏄惁鏄姝ユ斁琛�
- String toLocation = insReportService.moveRawMaterial(ifsInventoryQuantity);
+ String toLocation = insOrderService.moveRawMaterial(ifsInventoryQuantity);
ifsInventoryQuantityMapper.update(null, new LambdaUpdateWrapper<IfsInventoryQuantity>()
.set(IfsInventoryQuantity::getInspectStatus, 4)
@@ -759,7 +779,7 @@
* @return
*/
@Override
- public boolean advancedGodown(Integer ifsInventoryId) {
+ public boolean advancedGodown(Long ifsInventoryId) {
// 鏌ヨ鍘熸潗鏂欎俊鎭�
IfsInventoryQuantity ifsInventoryQuantity = ifsInventoryQuantityMapper.selectById(ifsInventoryId);
if (!ifsInventoryQuantity.getInspectStatus().equals(0)
@@ -768,7 +788,7 @@
}
// todo:闇�瑕佸垽鏂璷a娴佺▼鏄惁鏄姝ユ斁琛�
- String toLocation = insReportService.moveRawMaterial(ifsInventoryQuantity);
+ String toLocation = insOrderService.moveRawMaterial(ifsInventoryQuantity);
ifsInventoryQuantityMapper.update(null, new LambdaUpdateWrapper<IfsInventoryQuantity>()
.set(IfsInventoryQuantity::getInspectStatus, 1)
@@ -779,6 +799,145 @@
return true;
}
+ @Override
+ public void downloadTemplate(HttpServletResponse response) {
+ response.reset();
+ try{
+ String fileName = "璁㈠崟鎷嗗垎瀵煎叆妯℃澘" + ExcelTypeEnum.XLSX.getValue();
+ fileName = URLEncoder.encode(fileName, StandardCharsets.UTF_8.toString());
+ response.setContentType("application/vnd.ms-excel");
+ response.setHeader("Cache-Control", "no-cache");
+ response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
+ response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
+ //璁㈠崟鎷嗗垎瀵煎叆妯℃澘鏂囦欢
+ InputStream inputStream = this.getClass().getResourceAsStream("/static/split_order_import_template.xlsx");
+ IoUtil.copy(inputStream,response.getOutputStream());
+ inputStream.close();
+ }catch (Exception e){
+ e.printStackTrace();
+ throw new RuntimeException("妯℃澘涓嬭浇澶辫触");
+ }
+ }
+
+ @Override
+ public Result importSplitOrderData(MultipartFile file, Long ifsId, HttpServletRequest request) {
+ try {
+ IfsInventoryQuantity ifsInventoryQuantity = ifsInventoryQuantityMapper.selectById(ifsId);
+ OrderSplitExcelListener listener = new OrderSplitExcelListener(ifsInventoryQuantity);
+ EasyExcel.read(file.getInputStream(), listener).sheet().headRowNumber(2).doRead();
+ if(StringUtils.isNotBlank(listener.errorMsg)){
+ return Result.fail(201,listener.errorMsg);
+ }
+ return Result.success(listener.getDataList());
+ } catch (IOException e) {
+ e.printStackTrace();
+ throw new RuntimeException("瀵煎叆澶辫触:"+e.getMessage());
+ }
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class,isolation = Isolation.READ_COMMITTED)
+ public boolean confirmSplitOrder(OrderSplitDTO orderSplitDTO) {
+ //1.鏌ヨifs璁㈠崟淇℃伅
+ IfsInventoryQuantity ifsInventoryQuantity = ifsInventoryQuantityMapper.selectById(orderSplitDTO.getIfsId());
+ if(Objects.isNull(ifsInventoryQuantity)){
+ throw new RuntimeException("鏈煡璇㈠埌璇FS璁㈠崟淇℃伅");
+ }
+ //2.瀵规帴ifs閲囪喘鎺ユ敹鏇存敼鎵瑰彿鎺ュ彛
+ //缁勮璇锋眰鍙傛暟inAttr
+ List<String> newLotBathNo = new ArrayList<>();//鏂版壒鍙峰垪琛�
+ Map<String,Object> inAttrMap = new HashMap<>();
+ inAttrMap.put("RECORD_ID",UUID.randomUUID().toString());
+ inAttrMap.put("SYSCODE","LIMS_ZB");
+ inAttrMap.put("SYSMODEL","瑁呭LIMS璁㈠崟鎷嗗垎");
+ List<Map<String,Object>> batchInfoData = new ArrayList<>();
+ if(Objects.nonNull(orderSplitDTO.getSplitDetailList()) && !orderSplitDTO.getSplitDetailList().isEmpty()){
+ for (OrderSplitExcelData data : orderSplitDTO.getSplitDetailList()) {
+ Map<String, Object> infoMap = new HashMap<>();
+ infoMap.put("ORDER_NO",ifsInventoryQuantity.getOrderNo());
+ infoMap.put("LINE_NO",ifsInventoryQuantity.getLineNo());
+ infoMap.put("RELEASE_NO",ifsInventoryQuantity.getReleaseNo());
+ infoMap.put("RECEIPT_NO",ifsInventoryQuantity.getReceiptNo());
+ infoMap.put("PART_NO",ifsInventoryQuantity.getPartNo());
+ infoMap.put("CONFIGURATION_ID",ifsInventoryQuantity.getConfigurationId());
+ infoMap.put("LOCATION_NO",ifsInventoryQuantity.getLocationNo());
+ infoMap.put("LOT_BATCH_NO",ifsInventoryQuantity.getLotBatchNo());
+ infoMap.put("NEW_LOT_BATCH_NO",data.getLotBatchNo());
+ newLotBathNo.add(data.getLotBatchNo());
+ infoMap.put("SERIAL_NO",ifsInventoryQuantity.getSerialNo());
+ infoMap.put("ENG_CHG_LEVEL",ifsInventoryQuantity.getEngChgLevel());
+ infoMap.put("WAIV_DEV_REJ_NO",ifsInventoryQuantity.getWaivDevRejNo());
+ infoMap.put("ACTIVITY_SEQ",ifsInventoryQuantity.getActivitySeq());
+ infoMap.put("QTY_TO_CHANGE",data.getQtyStock());
+ batchInfoData.add(infoMap);
+ }
+ }
+ inAttrMap.put("BATCH_INFO", batchInfoData);
+ String inAttr = JSONObject.toJSONString(inAttrMap);
+ //璋冪敤ifs鎺ュ彛
+ Result result = ifsApiUtils.updateMoveReceiptLot(inAttr);
+ if(result.getCode()!=200){
+ throw new RuntimeException("IFS閲囪喘鎺ユ敹鏇存敼鎵瑰彿璇锋眰寮傚父锛�"+result.getMessage());
+ }
+ //鏇存柊涓昏鍗曠殑鎶佃揪閲囪喘鏁伴噺
+ BigDecimal purQtyInStore = orderSplitDTO.getSplitDetailList()
+ .stream()
+ .map(OrderSplitExcelData::getQtyStock)
+ .reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
+ BigDecimal newPurQtyInStore = ifsInventoryQuantity.getPurQtyInStore().subtract(purQtyInStore);
+ //濡傛灉鎷嗗垎鍚庯紝鍓╀綑鐨勫簱瀛樻暟閲忎负0锛屽垯鍒犻櫎鎵瑰彿涓�*鐨勮鍗曚俊鎭�
+ if(newPurQtyInStore.compareTo(BigDecimal.ZERO)==0){
+ ifsInventoryQuantityMapper.deleteById(ifsInventoryQuantity.getId());
+ }else{
+ ifsInventoryQuantityMapper.update(null,Wrappers.<IfsInventoryQuantity>lambdaUpdate()
+ .set(IfsInventoryQuantity::getPurQtyInStore,newPurQtyInStore)
+ .set(IfsInventoryQuantity::getInvQtyInStore,newPurQtyInStore)
+ .eq(IfsInventoryQuantity::getId,ifsInventoryQuantity.getId())
+ );
+ }
+ //ifs鏇存敼鎵瑰彿鎺ュ彛璋冪敤鎴愬姛锛屾媺鍙栨柊鎷嗗垎鐨刬fs璁㈠崟骞舵姤妫�
+ Map<String, Object> map = new HashMap<>();
+ map.put("LOCATION_NO","1302");
+ map.put("STATE_DB","To be Inspected");
+ map.put("PART_NO",ifsInventoryQuantity.getPartNo());
+ map.put("ORDER_NO",ifsInventoryQuantity.getOrderNo());
+ map.put("LINE_NO",ifsInventoryQuantity.getLineNo());
+ map.put("RELEASE_NO",ifsInventoryQuantity.getReleaseNo());
+ map.put("RECEIPT_NO",ifsInventoryQuantity.getReceiptNo());
+ map.put("LOT_BATCH_NO",String.join(";",newLotBathNo));
+ insOrderService.getIfsOrder(map,true);
+ //鏌ヨ鏂版媶鍒嗙殑璁㈠崟淇℃伅
+ List<IfsInventoryQuantity> splitOrderList = ifsInventoryQuantityMapper.selectList(Wrappers.<IfsInventoryQuantity>lambdaQuery()
+ .eq(IfsInventoryQuantity::getLocationNo, "1302")
+ .eq(IfsInventoryQuantity::getStatusDb, "To be Inspected")
+ .eq(IfsInventoryQuantity::getPartNo, ifsInventoryQuantity.getPartNo())
+ .eq(IfsInventoryQuantity::getOrderNo, ifsInventoryQuantity.getOrderNo())
+ .eq(IfsInventoryQuantity::getLineNo, ifsInventoryQuantity.getLineNo())
+ .eq(IfsInventoryQuantity::getReleaseNo, ifsInventoryQuantity.getReleaseNo())
+ .eq(IfsInventoryQuantity::getReceiptNo, ifsInventoryQuantity.getReceiptNo())
+ .in(IfsInventoryQuantity::getLotBatchNo, newLotBathNo)
+ );
+ //鎵ц鎶ユ鎿嶄綔
+ if(Objects.nonNull(splitOrderList) && !splitOrderList.isEmpty()){
+ List<Long> ids = splitOrderList.stream().map(IfsInventoryQuantity::getId).collect(Collectors.toList());
+ ids.add(ifsInventoryQuantity.getId());
+ this.inspectionReport(ids);
+ }
+ //鍕鹃�夊悓姝ュ埌MES锛屼繚瀛樿鍗曟媶鍒嗚褰�
+ if(orderSplitDTO.getPushToMes()){
+ List<IfsSplitOrderRecord> collect = orderSplitDTO.getSplitDetailList().stream().map(m -> {
+ IfsSplitOrderRecord record = new IfsSplitOrderRecord();
+ BeanUtil.copyProperties(m, record);
+ record.setOrderNo(ifsInventoryQuantity.getOrderNo());
+ record.setLineNo(ifsInventoryQuantity.getLineNo());
+ record.setReleaseNo(ifsInventoryQuantity.getReleaseNo());
+ record.setReceiptNo(ifsInventoryQuantity.getReceiptNo());
+ return record;
+ }).collect(Collectors.toList());
+ return ifsSplitOrderRecordService.saveBatch(collect);
+ }
+ return false;
+ }
/**
* 娣诲姞宸ユ椂
--
Gitblit v1.9.3