From 695571c6009ecbc12e7d4a4fb147df7967a1260e Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 07 七月 2025 20:21:19 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Check/CheckOrderResultController.cs | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Check/CheckOrderResultController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Check/CheckOrderResultController.cs"
index 010d8ab..9b4b87b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Check/CheckOrderResultController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Check/CheckOrderResultController.cs"
@@ -25,9 +25,30 @@
/// <param name="checkResult"></param>
/// <returns></returns>
[HttpPost, Route("CommitCheckResult")]
- public WebResponseContent CommitCheckResult(int checkOrderId,[FromBody] Dt_CheckOrderResult checkResult)
+ public WebResponseContent CommitCheckResult(int checkOrderId,[FromBody] Dt_CheckOrderResult checkResult, int isAccept = 0)
{
- return Service.CommitCheckResult(checkOrderId, checkResult);
+ return Service.CommitCheckResult(checkOrderId, checkResult, isAccept);
+ }
+ /// <summary>
+ /// 鎻愪氦閫佹缁撴灉
+ /// </summary>
+ /// <param name="checkOrderId"></param>
+ /// <param name="checkResult"></param>
+ /// <returns></returns>
+ [HttpPost, Route("CommitInspectResult")]
+ public WebResponseContent CommitInspectResult(int checkOrderId, [FromBody] Dt_CheckOrderResult checkResult, int isAccept = 0)
+ {
+ return Service.CommitInspectResult(checkOrderId, checkResult, isAccept);
+ }
+ /// <summary>
+ /// 鑾峰彇妫�楠屼俊鎭�
+ /// </summary>
+ /// <param name="checkId"></param>
+ /// <returns></returns>
+ [HttpPost, Route("GetCheckResultInfo")]
+ public WebResponseContent GetCheckResultInfo(int checkId)
+ {
+ return Service.GetCheckResultInfo(checkId);
}
}
}
--
Gitblit v1.9.3