From 3b71cac369fb246ceafa59ffa3b775c2afc8add4 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 07 一月 2026 09:25:31 +0800
Subject: [PATCH] 1.报工
---
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 110 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
index 2a958ef..efa13d3 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -1,29 +1,133 @@
package com.ruoyi.production.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.production.dto.ProcessRouteItemDto;
-import com.ruoyi.production.dto.ProductOrderDto;
+import com.ruoyi.basic.mapper.ProductModelMapper;
+import com.ruoyi.production.controller.ProductWorkOrderController;
import com.ruoyi.production.dto.ProductionProductMainDto;
-import com.ruoyi.production.mapper.ProcessRouteItemMapper;
-import com.ruoyi.production.mapper.ProductionProductMainMapper;
+import com.ruoyi.production.mapper.*;
+import com.ruoyi.production.pojo.ProductProcessRouteItem;
import com.ruoyi.production.pojo.ProductionProductMain;
+import com.ruoyi.production.pojo.ProductionProductOutput;
import com.ruoyi.production.service.ProductionProductMainService;
import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import com.ruoyi.production.mapper.ProductionProductMainMapper;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
import java.util.List;
+import java.util.Map;
@Service
@AllArgsConstructor
public class ProductionProductMainServiceImpl extends ServiceImpl<ProductionProductMainMapper, ProductionProductMain> implements ProductionProductMainService {
- @Autowired
+
private ProductionProductMainMapper productionProductMainMapper;
+
+ private ProductWorkOrderController productWorkOrderController;
+
+ private ProductWorkOrderMapper productWorkOrderMapper;
+
+ private ProductProcessRouteItemMapper productProcessRouteItemMapper;
+
+ private ProductionProductOutputMapper productionProductOutputMapper;
+
+ private ProcessRouteItemMapper processRouteItemMapper;
+
+ private ProductModelMapper productModelMapper;
+
@Override
public IPage<ProductionProductMainDto> listPageProductionProductMainDto(Page page, ProductionProductMainDto productionProductMainDto) {
return productionProductMainMapper.listPageProductionProductMainDto(page, productionProductMainDto);
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Boolean addProductMain(ProductionProductMainDto dto) {
+ if (dto == null) {
+ throw new RuntimeException("鍙傛暟涓嶈兘涓虹┖");
+ }
+
+ // 鍒ゆ柇鏄柊澧炶繕鏄洿鏂�
+ if (dto.getId() != null) {
+ // 鏇存柊閫昏緫 - 鍙洿鏂版暟閲�
+ QueryWrapper<ProductionProductOutput> outputWrapper = new QueryWrapper<>();
+ outputWrapper.eq("product_main_id", dto.getId());
+
+ ProductionProductOutput output = productionProductOutputMapper.selectOne(outputWrapper);
+ if (output == null) {
+ throw new RuntimeException("浜у嚭璁板綍涓嶅瓨鍦�");
+ }
+
+ // 鍙洿鏂版暟閲�
+ if (dto.getQuantity() != null) {
+ output.setQuantity(dto.getQuantity());
+ productionProductOutputMapper.updateById(output);
+ }
+ return true;
+ }
+
+ // 鏂板閫昏緫
+ ProductionProductMain productionProductMain = new ProductionProductMain();
+ ProductProcessRouteItem productProcessRouteItem = productProcessRouteItemMapper.selectById(dto.getProductProcessRouteItemId());
+ if (productProcessRouteItem == null) {
+ throw new RuntimeException("宸ヨ壓璺嚎椤逛笉瀛樺湪");
+ }
+
+ String datePrefix = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+
+ QueryWrapper<ProductionProductMain> queryWrapper = new QueryWrapper<>();
+ queryWrapper.select("MAX(product_no) as maxNo")
+ .likeRight("product_no", datePrefix);
+
+ // 淇锛氬畨鍏ㄥ鐞嗗彲鑳戒负绌虹殑鏌ヨ缁撴灉
+ List<Map<String, Object>> resultList = productionProductMainMapper.selectMaps(queryWrapper);
+
+ int sequenceNumber = 1;
+ if (resultList != null && !resultList.isEmpty()) {
+ Map<String, Object> result = resultList.get(0);
+
+ if (result != null) {
+ Object maxNoObj = result.get("maxNo");
+ if (maxNoObj != null) {
+ String lastNo = maxNoObj.toString();
+ System.out.println("lastNo: " + lastNo);
+
+ if (lastNo.startsWith(datePrefix)) {
+ try {
+ String seqStr = lastNo.substring(datePrefix.length());
+ sequenceNumber = Integer.parseInt(seqStr) + 1;
+ } catch (NumberFormatException e) {
+ sequenceNumber = 1;
+ }
+ }
+ }
+ }
+ }
+
+ String productNo = String.format("%s%03d", datePrefix, sequenceNumber);
+ productionProductMain.setProductNo(productNo);
+ productionProductMain.setUserId(dto.getUserId());
+ productionProductMain.setProductProcessRouteItemId(dto.getProductProcessRouteItemId());
+ productionProductMain.setWorkOrderId(dto.getWorkOrderId());
+ productionProductMain.setStatus(0);
+
+ // 娣诲姞鎶ュ伐涓昏〃
+ productionProductMainMapper.insert(productionProductMain);
+
+ // 娣诲姞浜у嚭
+ ProductionProductOutput productionProductOutput = new ProductionProductOutput();
+ productionProductOutput.setProductMainId(productionProductMain.getId());
+ productionProductOutput.setProductModelId(productProcessRouteItem.getProductModelId());
+ productionProductOutput.setQuantity(dto.getQuantity() != null ? dto.getQuantity() : BigDecimal.ZERO);
+ productionProductOutputMapper.insert(productionProductOutput);
+
+ return true;
+ }
}
--
Gitblit v1.9.3