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