From f7f7d757bd9dd14b6f860f2bfd5e06399a47f69f Mon Sep 17 00:00:00 2001 From: qiankanghui Date: Tue, 23 Jun 2026 11:30:23 +0800 Subject: [PATCH] =?UTF-8?q?feat(qms):=20=E6=B7=BB=E5=8A=A0=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E5=8D=95=E5=88=A0=E9=99=A4=E6=97=B6=E7=9A=84=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=9B=9E=E6=BB=9A=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 rollbackHeaderToScheduled 方法用于回滚头表状态为已排程 - 在 IQC 记录删除时添加状态一致性校验 - 实现明细回滚后检查是否全部为已排程状态 - 当所有明细都回滚为已排程时自动更新主单状态 - 优化 PO 行号转换逻辑并添加异常处理 - 添加详细的日志记录用于调试跟踪 --- src/main/java/com/xujie/modules/order/vo/PODetailVo.java | 3 +++ .../mapper/inspection/InspectionRequestHeaderMapper.xml | 3 ++- src/main/resources/mapper/order/PODetailMapper.xml | 9 +++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/xujie/modules/order/vo/PODetailVo.java b/src/main/java/com/xujie/modules/order/vo/PODetailVo.java index bbf0a70..48c9bee 100644 --- a/src/main/java/com/xujie/modules/order/vo/PODetailVo.java +++ b/src/main/java/com/xujie/modules/order/vo/PODetailVo.java @@ -319,6 +319,9 @@ public class PODetailVo extends QueryPage { @ApiModelProperty(value = "品名（货号）") private String sku; + @ApiModelProperty(value = "验货完成数量") + private Integer inspectionCompletedQty; + public Object getKey() { diff --git a/src/main/resources/mapper/inspection/InspectionRequestHeaderMapper.xml b/src/main/resources/mapper/inspection/InspectionRequestHeaderMapper.xml index b4193ad..69dafbb 100644 --- a/src/main/resources/mapper/inspection/InspectionRequestHeaderMapper.xml +++ b/src/main/resources/mapper/inspection/InspectionRequestHeaderMapper.xml @@ -235,7 +235,8 @@ UPDATE srm_inspection_request_header SET status = '验货完成', - status_db = 'InspectionCompleted' + status_db = 'InspectionCompleted', + inspect_date = GETDATE() WHERE site = #{site} AND request_no = #{requestNo} diff --git a/src/main/resources/mapper/order/PODetailMapper.xml b/src/main/resources/mapper/order/PODetailMapper.xml index 328625d..5d978b3 100644 --- a/src/main/resources/mapper/order/PODetailMapper.xml +++ b/src/main/resources/mapper/order/PODetailMapper.xml @@ -222,6 +222,15 @@ ,p.category ,p.sku + ,(SELECT COALESCE(SUM(ds.qty), 0) + FROM srm_inspection_request_header h + INNER JOIN srm_inspect_request_detail d ON h.request_no = d.request_no AND h.site = d.site + INNER JOIN srm_inspect_request_detail_sub ds ON d.request_no = ds.request_no AND d.site = ds.site AND d.item_no = ds.item_no + WHERE h.site = pod.site + AND h.supplier_no = poh.supplier_no + AND ds.po_no = pod.order_no + AND ds.po_item_no = pod.item_no + AND d.status_db = 'InspectionCompleted') AS inspectionCompletedQty from PODetail pod left join POHeader poh on poh.order_no = pod.order_no