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/pojo/ProductionProductMain.java | 8 +-
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 114 ++++++++++++++++++++++++++-----------
src/main/java/com/ruoyi/production/mapper/ProductionProductMainMapper.java | 6 -
src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java | 20 ++++--
4 files changed, 101 insertions(+), 47 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java b/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
index 152ddc8..0a9876a 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
@@ -3,13 +3,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.production.dto.ProductionProductMainDto;
-import com.ruoyi.production.pojo.ProductionProductMain;
import com.ruoyi.production.service.ProductionProductMainService;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
@RequestMapping("productionProductMain")
@RestController
@@ -19,13 +16,24 @@
@Autowired
private ProductionProductMainService productionProductMainService;
+ /**
+ * 鎶ュ伐鏌ヨ
+ * @param page
+ * @param productionProductMainDto
+ * @return
+ */
@GetMapping("listPage")
public R page(Page<ProductionProductMainDto> page, ProductionProductMainDto productionProductMainDto) {
return R.ok(productionProductMainService.listPageProductionProductMainDto(page, productionProductMainDto));
}
- @GetMapping("addProductMain")
- public R addProductMain(ProductionProductMainDto productionProductMainDto) {
+ /**
+ * 鎶ュ伐鏂板鏇存柊
+ * @param productionProductMainDto
+ * @return
+ */
+ @PostMapping("addProductMain")
+ public R addProductMain(@RequestBody ProductionProductMainDto productionProductMainDto) {
return R.ok(productionProductMainService.addProductMain(productionProductMainDto));
}
}
diff --git a/src/main/java/com/ruoyi/production/mapper/ProductionProductMainMapper.java b/src/main/java/com/ruoyi/production/mapper/ProductionProductMainMapper.java
index dd99553..cedb9f4 100644
--- a/src/main/java/com/ruoyi/production/mapper/ProductionProductMainMapper.java
+++ b/src/main/java/com/ruoyi/production/mapper/ProductionProductMainMapper.java
@@ -3,16 +3,14 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.production.dto.ProductOrderDto;
import com.ruoyi.production.dto.ProductionProductMainDto;
import com.ruoyi.production.pojo.ProductionProductMain;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
-import javax.annotation.ManagedBean;
-import java.util.List;
-
@Mapper
public interface ProductionProductMainMapper extends BaseMapper<ProductionProductMain> {
+
IPage<ProductionProductMainDto> listPageProductionProductMainDto(Page page, @Param("c") ProductionProductMainDto productionProductMainDto);
+
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java b/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
index 5bd20c0..a4326a6 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
@@ -23,15 +23,17 @@
private Long userId;
@ApiModelProperty(value = "鎶ュ伐浜哄憳")
- private Long userName;
+ private String userName;
+
+ @ApiModelProperty(value = "鐢熶骇椤圭洰id")
+ private Long productProcessRouteItemId;
@ApiModelProperty(value = "宸ュ崟id")
- private String productProcessRouteItemId;
+ private Long workOrderId;
@ApiModelProperty(value = "鎶ュ伐鐘舵��")
private Integer status;
- @TableField(fill = FieldFill.INSERT)
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
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 3868440..efa13d3 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -6,36 +6,39 @@
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.*;
-import com.ruoyi.production.pojo.*;
+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;
- @Autowired
+
private ProductWorkOrderController productWorkOrderController;
- @Autowired
+
private ProductWorkOrderMapper productWorkOrderMapper;
- @Autowired
+
private ProductProcessRouteItemMapper productProcessRouteItemMapper;
- @Autowired
+
private ProductionProductOutputMapper productionProductOutputMapper;
- @Autowired
+
private ProcessRouteItemMapper processRouteItemMapper;
- @Autowired
+
private ProductModelMapper productModelMapper;
@@ -45,43 +48,86 @@
}
@Override
- public Boolean addProductMain(ProductionProductMainDto productionProductMainDto) {
+ @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(productionProductMainDto.getProductProcessRouteItemId());
+ 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.likeRight("work_order_no", datePrefix)
- .orderByDesc("work_order_no")
- .last("LIMIT 1");
+ queryWrapper.select("MAX(product_no) as maxNo")
+ .likeRight("product_no", datePrefix);
- ProductionProductMain lastWorkOrder = productionProductMainMapper.selectOne(queryWrapper);
+ // 淇锛氬畨鍏ㄥ鐞嗗彲鑳戒负绌虹殑鏌ヨ缁撴灉
+ List<Map<String, Object>> resultList = productionProductMainMapper.selectMaps(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;
+ 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 workOrderNoStr = String.format("%s%03d", datePrefix, sequenceNumber);
- productionProductMain.setProductNo(workOrderNoStr);
- productionProductMain.setUserId(productionProductMainDto.getUserId());
- productionProductMain.setProductProcessRouteItemId(productionProductMainDto.getProductProcessRouteItemId());
+
+ 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(productionProductMainDto.getQuantity());
- //娣诲姞浜у嚭
+ productionProductOutput.setQuantity(dto.getQuantity() != null ? dto.getQuantity() : BigDecimal.ZERO);
productionProductOutputMapper.insert(productionProductOutput);
+
return true;
}
}
--
Gitblit v1.9.3