From 53577ae0fcba9342b22ad1758303aa61409160d1 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 12 九月 2025 19:10:58 +0800
Subject: [PATCH] art: 设备保养标准导入问题修改
---
src/main/java/org/jeecg/modules/cms/service/impl/CuttingReceiveServiceImpl.java | 142 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 141 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/cms/service/impl/CuttingReceiveServiceImpl.java b/src/main/java/org/jeecg/modules/cms/service/impl/CuttingReceiveServiceImpl.java
index b385d79..69edf6b 100644
--- a/src/main/java/org/jeecg/modules/cms/service/impl/CuttingReceiveServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/cms/service/impl/CuttingReceiveServiceImpl.java
@@ -2,13 +2,26 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.micrometer.core.annotation.Timed;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.cms.entity.CuttingInventory;
import org.jeecg.modules.cms.entity.CuttingReceive;
+import org.jeecg.modules.cms.entity.CuttingReceiveDetail;
+import org.jeecg.modules.cms.entity.RatedLife;
import org.jeecg.modules.cms.mapper.CuttingReceiveMapper;
+import org.jeecg.modules.cms.service.ICuttingInventoryService;
+import org.jeecg.modules.cms.service.ICuttingReceiveDetailService;
import org.jeecg.modules.cms.service.ICuttingReceiveService;
+import org.jeecg.modules.cms.service.IRatedLifeService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
/**
@@ -17,12 +30,139 @@
* @Date: 2025-07-28
* @Version: V1.0
*/
+@Slf4j
@Service
public class CuttingReceiveServiceImpl extends ServiceImpl<CuttingReceiveMapper, CuttingReceive> implements ICuttingReceiveService {
-
+ @Autowired
+ private ICuttingInventoryService cuttingInventoryService;
+ @Autowired
+ private ICuttingReceiveDetailService cuttingReceiveDetailService;
+ @Autowired
+ private IRatedLifeService ratedLifeService;
@Override
public IPage<Map<String, Object>> getInventoryToolList(Integer pageNo, Integer pageSize, Map<String, Object> params) {
IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
return super.getBaseMapper().getInventoryToolList(pageData,params);
}
+ @Override
+ @Timed(value = "cutting.receive.submit", description = "鍒�鍏烽鐢ㄦ彁浜よ�楁椂")
+ public synchronized Result<?> submit(String orderId) {
+ long startTime = System.currentTimeMillis();
+ try {
+ // 1. 鏇存柊棰嗙敤鍗曠姸鎬�
+ CuttingReceive cuttingReceive = this.getById(orderId);
+ if (cuttingReceive == null) {
+ return Result.error("鏈壘鍒板搴旂殑棰嗙敤鍗�");
+ }
+
+ // 妫�鏌ラ鐢ㄥ崟鐘舵�侊紝鍙厑璁哥姸鎬佷负"1"鐨勯鐢ㄥ崟鎻愪氦
+ if (!"1".equals(cuttingReceive.getOrderStatus())) {
+ return Result.error("鍙湁鐘舵�佷负鏈彁浜ょ殑棰嗙敤鍗曟墠鑳芥墽琛屾彁浜ゆ搷浣�");
+ }
+
+ cuttingReceive.setOrderStatus("2"); // 璁剧疆涓哄凡棰嗙敤鐘舵��
+ boolean updateResult = this.updateById(cuttingReceive);
+ if (!updateResult) {
+ return Result.error("鏇存柊棰嗙敤鍗曠姸鎬佸け璐ワ紝鍙兘宸茶鍏朵粬鐢ㄦ埛澶勭悊");
+ }
+
+ // 2. 鑾峰彇棰嗙敤鏄庣粏
+ List<CuttingReceiveDetail> detailList = cuttingReceiveDetailService.lambdaQuery()
+ .eq(CuttingReceiveDetail::getOrderId, orderId)
+ .list();
+
+ // 3. 鏀堕泦鎵�鏈夐渶瑕佹洿鏂扮姸鎬佺殑搴撳瓨ID
+ List<String> inventoryIds = new ArrayList<>();
+ for (CuttingReceiveDetail detail : detailList) {
+ if (detail.getInventoryId() != null && !detail.getInventoryId().isEmpty()) {
+ inventoryIds.add(detail.getInventoryId());
+ }
+ }
+
+ // 4. 鎵归噺鏇存柊搴撳瓨鐘舵�佷负"宸插嚭搴�"
+ if (!inventoryIds.isEmpty()) {
+ cuttingInventoryService.updateStatus(inventoryIds, "宸插嚭搴�");
+ }
+
+ long endTime = System.currentTimeMillis();
+ log.info("鍒�鍏烽鐢ㄦ彁浜ゅ畬鎴愶紝鑰楁椂: {} ms", (endTime - startTime));
+ return Result.ok("鎻愪氦鎴愬姛");
+
+ } catch (Exception e) {
+ long endTime = System.currentTimeMillis();
+ log.error("鎻愪氦棰嗙敤鍗曞け璐ワ紝orderId: " + orderId + "锛岃�楁椂: " + (endTime - startTime) + " ms", e);
+ return Result.error("鎻愪氦澶辫触: " + e.getMessage());
+ }
+ }
+
+ @Override
+ public synchronized Result<?> handleBack(String orderId) {
+ long startTime = System.currentTimeMillis();
+ try {
+ // 1. 鏇存柊棰嗙敤鍗曠姸鎬佷负宸插綊杩�
+ CuttingReceive cuttingReceive = this.getById(orderId);
+ if (cuttingReceive == null) {
+ return Result.error("鏈壘鍒板搴旂殑棰嗙敤鍗�");
+ }
+
+ // 妫�鏌ラ鐢ㄥ崟鐘舵�侊紝鍙厑璁哥姸鎬佷负"宸查鐢�"鐨勯鐢ㄥ崟杩涜褰掕繕鎿嶄綔
+ if (!"2".equals(cuttingReceive.getOrderStatus())) {
+ return Result.error("鍙湁鐘舵�佷负宸查鐢ㄧ殑棰嗙敤鍗曟墠鑳芥墽琛屽綊杩樻搷浣�");
+ }
+
+ cuttingReceive.setOrderStatus("3"); // 璁剧疆涓哄凡褰掕繕鐘舵��
+ boolean updateResult = this.updateById(cuttingReceive);
+ if (!updateResult) {
+ return Result.error("鏇存柊棰嗙敤鍗曠姸鎬佸け璐ワ紝鍙兘宸茶鍏朵粬鐢ㄦ埛澶勭悊");
+ }
+
+ // 2. 鑾峰彇棰嗙敤鏄庣粏
+ List<CuttingReceiveDetail> detailList = cuttingReceiveDetailService.lambdaQuery()
+ .eq(CuttingReceiveDetail::getOrderId, orderId)
+ .list();
+
+ // 3. 鏀堕泦鎵�鏈夐渶瑕佹洿鏂扮姸鎬佺殑搴撳瓨ID
+ List<String> inventoryIds = new ArrayList<>();
+ for (CuttingReceiveDetail detail : detailList) {
+ if (detail.getInventoryId() != null && !detail.getInventoryId().isEmpty()) {
+ inventoryIds.add(detail.getInventoryId());
+ }
+ }
+
+ // 4. 鎵归噺鏇存柊搴撳瓨鐘舵�佷负"姝ｅ父"
+ if (!inventoryIds.isEmpty()) {
+ cuttingInventoryService.updateStatus(inventoryIds, "姝ｅ父");
+ }
+ // 5. 瀵垮懡鎵ｅ噺
+ for (CuttingReceiveDetail detail : detailList) {
+ if (detail.getInventoryId() != null && !detail.getInventoryId().isEmpty()) {
+ CuttingInventory inventory = cuttingInventoryService.getById(detail.getInventoryId());
+ //FIXME:ratedLife绌烘寚閽�
+ RatedLife ratedLife = ratedLifeService.lambdaQuery() //棰濆畾瀵垮懡
+ .eq(RatedLife::getCuttingId, inventory.getCuttingId())
+ .eq(RatedLife::getWorkpieceMaterial, inventory.getWorkpieceMaterial())
+ .one();
+
+ BigDecimal currentLife = inventory.getCurrentLife().divide(BigDecimal.valueOf(100),java.math.RoundingMode.HALF_UP);//褰撳墠瀵垮懡鐧惧垎姣�
+ Integer useLife = detail.getUsedLife();//浣跨敤瀵垮懡
+ //璁＄畻鍏紡: (ratedLife * currentLife - useLife) * 100
+ BigDecimal newLife = ratedLife.getRatedLife()
+ .multiply(currentLife)
+ .subtract(BigDecimal.valueOf(useLife))
+ .multiply(BigDecimal.valueOf(100));
+ // 鏇存柊搴撳瓨瀵垮懡
+ inventory.setCurrentLife(newLife);
+ cuttingInventoryService.updateById(inventory);
+ }
+ }
+ long endTime = System.currentTimeMillis();
+ log.info("鍒�鍏峰綊杩樺鐞嗗畬鎴愶紝鑰楁椂: {} ms", (endTime - startTime));
+ return Result.ok("褰掕繕鎴愬姛");
+
+ } catch (Exception e) {
+ long endTime = System.currentTimeMillis();
+ log.error("澶勭悊褰掕繕澶辫触锛宱rderId: " + orderId + "锛岃�楁椂: " + (endTime - startTime) + " ms", e);
+ return Result.error("褰掕繕澶辫触: " + e.getMessage());
+ }
+ }
}
--
Gitblit v1.9.3