From 7d074703a8364c27ca38cbb8f82ebd2f6e85cf22 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期二, 07 一月 2025 14:46:27 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/CJGL/Qc_PreventErrMouldCheckBillController.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Qc_PreventErrMouldCheckBillController.cs b/WebAPI/Controllers/CJGL/Qc_PreventErrMouldCheckBillController.cs
index 6efdc09..dec3bdd 100644
--- a/WebAPI/Controllers/CJGL/Qc_PreventErrMouldCheckBillController.cs
+++ b/WebAPI/Controllers/CJGL/Qc_PreventErrMouldCheckBillController.cs
@@ -211,7 +211,7 @@
oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
- oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
{
@@ -810,7 +810,7 @@
#region 鎶ュ伐鍙拌烦杞幏鍙栨暟鎹�
[Route("Qc_PreventErrMouldCheckBill/锘縌c_PreventErrMouldCheckBillList")]
[HttpGet]
- public object Qc_PreventErrMouldCheckBillList(string HMaterID, string User)
+ public object Qc_PreventErrMouldCheckBillList(string HMaterID,string HProcID,string SCOrder, string User)
{
try
{
@@ -835,7 +835,7 @@
return objJsonResult;
}
- ds = oCN.RunProcReturn("exec h_p_PreventErrMouldCheck '" + HMaterID + "'", "h_p_PreventErrMouldCheck");
+ ds = oCN.RunProcReturn("exec h_p_PreventErrMouldCheck '" + HMaterID + "','" + HProcID + "','" + SCOrder + "'", "h_p_PreventErrMouldCheck");
objJsonResult.code = "1";
objJsonResult.count = 1;
--
Gitblit v1.9.1