From ce53ee926968016bb6224f89b13edf07d8a7b4bf Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 27 五月 2026 14:22:14 +0800
Subject: [PATCH] 工序调整， 报工反改订单数量，判断是最后一道工序才修改订单完成数量
---
src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedOrderServiceImpl.java | 9 +++++++++
src/main/java/com/ruoyi/quality/service/QualityUnqualifiedOrderService.java | 2 ++
src/main/resources/mapper/quality/QualityUnqualifiedOrderMapper.xml | 2 +-
src/main/java/com/ruoyi/quality/pojo/QualityUnqualifiedOrder.java | 3 +++
src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedOrderController.java | 2 +-
5 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedOrderController.java b/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedOrderController.java
index 7db5273..be1a1a0 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedOrderController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedOrderController.java
@@ -37,7 +37,7 @@
@PostMapping("/save")
@ApiOperation(value = "淇濆瓨涓嶅悎鏍煎搧澶勭悊鍗�")
public R save(@RequestBody QualityUnqualifiedOrderDto qualityUnqualifiedOrder) {
- return R.ok(qualityUnqualifiedOrderService.save(qualityUnqualifiedOrder));
+ return R.ok(qualityUnqualifiedOrderService.add(qualityUnqualifiedOrder));
}
@PutMapping("/update")
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityUnqualifiedOrder.java b/src/main/java/com/ruoyi/quality/pojo/QualityUnqualifiedOrder.java
index 722471e..a9012de 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityUnqualifiedOrder.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityUnqualifiedOrder.java
@@ -57,6 +57,9 @@
@ApiModelProperty("鐗╂枡/閮ㄤ欢鍚嶇О")
private String materialName;
+ @ApiModelProperty("鍏宠仈浜у搧鍨嬪彿ID")
+ private Long productModelId;
+
@ApiModelProperty("鐗╂枡鍥惧彿")
private String materialDrawingNo;
diff --git a/src/main/java/com/ruoyi/quality/service/QualityUnqualifiedOrderService.java b/src/main/java/com/ruoyi/quality/service/QualityUnqualifiedOrderService.java
index 4416107..ea253f0 100644
--- a/src/main/java/com/ruoyi/quality/service/QualityUnqualifiedOrderService.java
+++ b/src/main/java/com/ruoyi/quality/service/QualityUnqualifiedOrderService.java
@@ -18,4 +18,6 @@
IPage<QualityUnqualifiedOrderDto> listPage(Page page, QualityUnqualifiedOrderDto qualityUnqualifiedOrder);
+ Boolean add(QualityUnqualifiedOrderDto qualityUnqualifiedOrder);
+
}
diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedOrderServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedOrderServiceImpl.java
index 0ca1c3b..c52289b 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedOrderServiceImpl.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.quality.dto.QualityUnqualifiedOrderDto;
import com.ruoyi.quality.pojo.QualityUnqualifiedOrder;
import com.ruoyi.quality.mapper.QualityUnqualifiedOrderMapper;
@@ -28,4 +29,12 @@
public IPage<QualityUnqualifiedOrderDto> listPage(Page page, QualityUnqualifiedOrderDto qualityUnqualifiedOrder) {
return qualityUnqualifiedOrderMapper.listPage(page,qualityUnqualifiedOrder);
}
+
+ @Override
+ public Boolean add(QualityUnqualifiedOrderDto qualityUnqualifiedOrder) {
+ String s = OrderUtils.countTodayByCreateTime(qualityUnqualifiedOrderMapper, "BHG", "order_no");
+ qualityUnqualifiedOrder.setOrderNo(s);
+
+ return this.save(qualityUnqualifiedOrder);
+ }
}
diff --git a/src/main/resources/mapper/quality/QualityUnqualifiedOrderMapper.xml b/src/main/resources/mapper/quality/QualityUnqualifiedOrderMapper.xml
index 269bf03..5588b42 100644
--- a/src/main/resources/mapper/quality/QualityUnqualifiedOrderMapper.xml
+++ b/src/main/resources/mapper/quality/QualityUnqualifiedOrderMapper.xml
@@ -50,7 +50,7 @@
project_name = #{ew.projectName}
</if>
<if test="ew.orderNo != null">
- tenant_id = #{ew.orderNo}
+ order_no = #{ew.orderNo}
</if>
</where>
</select>
--
Gitblit v1.9.3