From 5d3c41d3416385e2d4a6175fece16754cc8869ef Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期二, 17 三月 2026 11:45:37 +0800
Subject: [PATCH] 印铜报工
---
src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java | 3 +++
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 1 +
src/main/resources/mapper/production/ProductionProductOutputMapper.xml | 1 +
src/main/resources/mapper/production/ProductionProductMainMapper.xml | 1 +
src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java | 10 +++-------
src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java | 4 +++-
6 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java b/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
index e4a0813..57348e6 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionProductMainController.java
@@ -3,21 +3,17 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.domain.R;
-import com.ruoyi.production.dto.ProductProcessRouteItemDto;
import com.ruoyi.production.dto.ProductionProductMainDto;
-import com.ruoyi.production.dto.SalesLedgerProductionAccountingDto;
import com.ruoyi.production.service.ProductionProductMainService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
import java.util.List;
-@RequestMapping("productionProductMain")
+@RequestMapping("/productionProductMain")
@RestController
@Api(value = "鐢熶骇鎶ュ伐")
public class ProductionProductMainController {
@@ -31,7 +27,7 @@
* @param productionProductMainDto
* @return
*/
- @GetMapping("listPage")
+ @GetMapping("/listPage")
public R page(Page<ProductionProductMainDto> page, ProductionProductMainDto productionProductMainDto) {
return R.ok(productionProductMainService.listPageProductionProductMainDto(page, productionProductMainDto));
}
@@ -41,7 +37,7 @@
* @param productionProductMainDto
* @return
*/
- @PostMapping("addProductMain")
+ @PostMapping("/addProductMain")
public R addProductMain(@RequestBody 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 9e5e121..65e93c2 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -10,7 +10,6 @@
import java.math.BigDecimal;
import java.time.LocalDate;
-import java.time.LocalDateTime;
@Data
@ExcelIgnoreUnannotated
@@ -61,5 +60,8 @@
private BigDecimal workHours;
private BigDecimal wages;
+ // 鍏朵粬鏁版嵁
+ private String otherData;
+
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java b/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
index f78df35..739ca15 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
@@ -33,4 +33,7 @@
@ApiModelProperty(value = "鎶ュ簾鏁伴噺")
private BigDecimal scrapQty;
+
+ @ApiModelProperty(value = "鍏朵粬鏁版嵁")
+ private String otherData;
}
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 b3f75b0..2eb0c88 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -163,6 +163,7 @@
productionProductOutput.setProductModelId(productProcessRouteItem.getProductModelId());
productionProductOutput.setQuantity(dto.getQuantity() != null ? dto.getQuantity() : BigDecimal.ZERO);
productionProductOutput.setScrapQty(dto.getScrapQty() != null ? dto.getScrapQty() : BigDecimal.ZERO);
+ productionProductOutput.setOtherData(dto.getOtherData() != null ? dto.getOtherData() : "");
productionProductOutputMapper.insert(productionProductOutput);
//鍚堟牸鏁伴噺=鎶ュ伐鏁伴噺-鎶ュ簾鏁伴噺
BigDecimal productQty = productionProductOutput.getQuantity().subtract(productionProductOutput.getScrapQty());
diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index a122e90..11301ad 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -22,6 +22,7 @@
pm.model as productModelName,
ppo.quantity,
ppo.scrap_qty,
+ ppo.other_data,
pm.unit,
sl.sales_contract_no salesContractNo
from
diff --git a/src/main/resources/mapper/production/ProductionProductOutputMapper.xml b/src/main/resources/mapper/production/ProductionProductOutputMapper.xml
index 3b44135..fad5b62 100644
--- a/src/main/resources/mapper/production/ProductionProductOutputMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductOutputMapper.xml
@@ -9,6 +9,7 @@
<result property="quantity" column="quantity"/>
<result property="tenantId" column="tenant_id"/>
<result property="createTime" column="create_time"/>
+ <result property="otherData" column="other_data"/>
</resultMap>
<select id="listPageProductionProductOutputDto" resultType="com.ruoyi.production.dto.ProductionProductOutputDto">
--
Gitblit v1.9.3