From 1125327095d325c9b248b3b72be7bc167e0b31d0 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 06 一月 2026 15:02:40 +0800
Subject: [PATCH] feat(production): 生产报工
---
src/main/java/com/ruoyi/production/service/ProductionProductMainService.java | 3 +
src/main/java/com/ruoyi/production/pojo/ProductionProductInput.java | 2 +
src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java | 5 ++
src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java | 2 +
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 64 ++++++++++++++++++++++++++++++-
src/main/java/com/ruoyi/production/pojo/ProcessRouteItem.java | 6 +--
src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java | 5 ++
doc/create_table_process_route_item.sql | 4 ++
src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java | 5 ++
9 files changed, 88 insertions(+), 8 deletions(-)
diff --git a/doc/create_table_process_route_item.sql b/doc/create_table_process_route_item.sql
index ea0a8a7..a1efff9 100644
--- a/doc/create_table_process_route_item.sql
+++ b/doc/create_table_process_route_item.sql
@@ -50,6 +50,10 @@
create_time datetime null comment '褰曞叆鏃堕棿',
update_time datetime null comment '鏇存柊鏃堕棿',
work_order_no varchar(255) not null default '' comment '宸ュ崟缂栧彿',
+ plan_start_time datetime null comment '璁″垝寮�濮嬫椂闂�',
+ plan_end_time datetime null comment '璁″垝缁撴潫鏃堕棿',
+ actual_start_time datetime null comment '瀹為檯寮�濮嬫椂闂�',
+ actual_end_time datetime null comment '瀹為檯缁撴潫鏃堕棿',
status int not null default 0 comment '鐘舵�� 1 寰呯‘璁� 2 寰呯敓浜� 3鐢熶骇涓� 4宸茬敓浜� ',
tenant_id bigint not null comment '绉熸埛id'
);
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java b/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
index a32cd4c..152ddc8 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
@@ -23,4 +23,9 @@
public R page(Page<ProductionProductMainDto> page, ProductionProductMainDto productionProductMainDto) {
return R.ok(productionProductMainService.listPageProductionProductMainDto(page, productionProductMainDto));
}
+
+ @GetMapping("addProductMain")
+ public R addProductMain(ProductionProductMainDto productionProductMainDto) {
+ return R.ok(productionProductMainService.addProductMain(productionProductMainDto));
+ }
}
diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
index c90bf87..9dfb35b 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -4,6 +4,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
+
@Data
public class ProductionProductMainDto extends ProductionProductMain {
@ApiModelProperty(value = "宸ュ崟缂栧彿")
@@ -14,4 +16,7 @@
@ApiModelProperty(value = "鎶ュ伐浜哄憳鏄电О")
private String nickName;
+
+ @ApiModelProperty(value = "鎶ュ伐鏁伴噺")
+ private BigDecimal quantity;
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProcessRouteItem.java b/src/main/java/com/ruoyi/production/pojo/ProcessRouteItem.java
index 9cfd326..66cbfdd 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProcessRouteItem.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProcessRouteItem.java
@@ -1,15 +1,13 @@
package com.ruoyi.production.pojo;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
@Data
+@TableName("process_route_item")
public class ProcessRouteItem {
@TableId(type = IdType.AUTO)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionProductInput.java b/src/main/java/com/ruoyi/production/pojo/ProductionProductInput.java
index d98e41d..271f460 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionProductInput.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionProductInput.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -10,6 +11,7 @@
import java.time.LocalDateTime;
@Data
+@TableName("production_product_input")
public class ProductionProductInput {
@TableId
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java b/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
index af1a21d..9a8088a 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
@@ -3,12 +3,14 @@
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
@Data
+@TableName("production_product_main")
public class ProductionProductMain {
@TableId
@@ -21,12 +23,13 @@
private Long userId;
@ApiModelProperty(value = "宸ュ崟id")
- private String workOrderId;
+ private String productProcessRouteItemId;
@ApiModelProperty(value = "鎶ュ伐鐘舵��")
private Integer status;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
@ApiModelProperty(value = "绉熸埛ID")
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java b/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
index f460948..7ed085b 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -10,6 +11,7 @@
import java.time.LocalDateTime;
@Data
+@TableName("production_product_input")
public class ProductionProductOutput {
@TableId
diff --git a/src/main/java/com/ruoyi/production/service/ProductionProductMainService.java b/src/main/java/com/ruoyi/production/service/ProductionProductMainService.java
index 8e1ec9a..bde9429 100644
--- a/src/main/java/com/ruoyi/production/service/ProductionProductMainService.java
+++ b/src/main/java/com/ruoyi/production/service/ProductionProductMainService.java
@@ -12,4 +12,7 @@
public interface ProductionProductMainService extends IService<ProductionProductMain> {
IPage<ProductionProductMainDto> listPageProductionProductMainDto(Page page, ProductionProductMainDto productionProductMainDto);
+
+ Boolean addProductMain(ProductionProductMainDto productionProductMainDto);
+
}
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..3868440 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -1,19 +1,23 @@
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.basic.mapper.ProductModelMapper;
+import com.ruoyi.production.controller.ProductWorkOrderController;
import com.ruoyi.production.dto.ProcessRouteItemDto;
import com.ruoyi.production.dto.ProductOrderDto;
import com.ruoyi.production.dto.ProductionProductMainDto;
-import com.ruoyi.production.mapper.ProcessRouteItemMapper;
-import com.ruoyi.production.mapper.ProductionProductMainMapper;
-import com.ruoyi.production.pojo.ProductionProductMain;
+import com.ruoyi.production.mapper.*;
+import com.ruoyi.production.pojo.*;
import com.ruoyi.production.service.ProductionProductMainService;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
import java.util.List;
@Service
@@ -21,9 +25,63 @@
public class ProductionProductMainServiceImpl extends ServiceImpl<ProductionProductMainMapper, ProductionProductMain> implements ProductionProductMainService {
@Autowired
private ProductionProductMainMapper productionProductMainMapper;
+ @Autowired
+ private ProductWorkOrderController productWorkOrderController;
+ @Autowired
+ private ProductWorkOrderMapper productWorkOrderMapper;
+ @Autowired
+ private ProductProcessRouteItemMapper productProcessRouteItemMapper;
+ @Autowired
+ private ProductionProductOutputMapper productionProductOutputMapper;
+ @Autowired
+ private ProcessRouteItemMapper processRouteItemMapper;
+ @Autowired
+ private ProductModelMapper productModelMapper;
+
@Override
public IPage<ProductionProductMainDto> listPageProductionProductMainDto(Page page, ProductionProductMainDto productionProductMainDto) {
return productionProductMainMapper.listPageProductionProductMainDto(page, productionProductMainDto);
}
+
+ @Override
+ public Boolean addProductMain(ProductionProductMainDto productionProductMainDto) {
+ ProductionProductMain productionProductMain = new ProductionProductMain();
+ ProductProcessRouteItem productProcessRouteItem = productProcessRouteItemMapper.selectById(productionProductMainDto.getProductProcessRouteItemId());
+ String datePrefix = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+ // 鏌ヨ浠婃棩宸插瓨鍦ㄧ殑鏈�澶у伐鍗曞彿
+ QueryWrapper<ProductionProductMain> queryWrapper = new QueryWrapper<>();
+ queryWrapper.likeRight("work_order_no", datePrefix)
+ .orderByDesc("work_order_no")
+ .last("LIMIT 1");
+
+ ProductionProductMain lastWorkOrder = productionProductMainMapper.selectOne(queryWrapper);
+
+ int sequenceNumber = 1; // 榛樿搴忓彿
+ if (lastWorkOrder != null && lastWorkOrder.getProductNo() != null) {
+ String lastNo = lastWorkOrder.getProductNo().toString();
+ if (lastNo.startsWith(datePrefix)) {
+ String seqStr = lastNo.substring(datePrefix.length());
+ try {
+ sequenceNumber = Integer.parseInt(seqStr) + 1;
+ } catch (NumberFormatException e) {
+ sequenceNumber = 1;
+ }
+ }
+ }
+ String workOrderNoStr = String.format("%s%03d", datePrefix, sequenceNumber);
+ productionProductMain.setProductNo(workOrderNoStr);
+ productionProductMain.setUserId(productionProductMainDto.getUserId());
+ productionProductMain.setProductProcessRouteItemId(productionProductMainDto.getProductProcessRouteItemId());
+ productionProductMain.setStatus(0);
+ //娣诲姞鎶ュ伐涓昏〃
+ productionProductMainMapper.insert(productionProductMain);
+ ProductionProductOutput productionProductOutput = new ProductionProductOutput();
+ productionProductOutput.setProductMainId(productionProductMain.getId());
+ productionProductOutput.setProductModelId(productProcessRouteItem.getProductModelId());
+ productionProductOutput.setQuantity(productionProductMainDto.getQuantity());
+ //娣诲姞浜у嚭
+ productionProductOutputMapper.insert(productionProductOutput);
+ return true;
+ }
}
--
Gitblit v1.9.3