From 9b14f573e76747a3b5a670a145f1ca2b36714d84 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期三, 03 十二月 2025 10:28:35 +0800
Subject: [PATCH] 仪器校准记录单修复
---
DAL/生产管理/模具管理/ClsGy_QCVerificationBillMain.cs | 19 +++++++++++--------
WebAPI/WebAPI.csproj.user | 11 +++++------
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs | 8 ++++----
3 files changed, 20 insertions(+), 18 deletions(-)
diff --git "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsGy_QCVerificationBillMain.cs" "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsGy_QCVerificationBillMain.cs"
index 13dec2b..25d1ce0 100644
--- "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsGy_QCVerificationBillMain.cs"
+++ "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsGy_QCVerificationBillMain.cs"
@@ -72,7 +72,7 @@
"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
"," + oSub.HInspectInstruMentID.ToString() + ",'" + oSub.HBeginDate + "','" + oSub.HEndDate.ToString() + "','" + oSub.HHCalibrationStatus.ToString() + "'" +
") ");
-
+ oCn.RunProc("update UPDATE from Gy_InspectInstruMent set HValidDate='" + oSub.HBeginDate + "',HExpiryDay='" + oSub.HEndDate + "'where HItemID=" + omodel.HInterID);
}
sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
oCn.Commit();
@@ -154,16 +154,19 @@
"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
"," + oSub.HInspectInstruMentID.ToString() + ",'" + oSub.HBeginDate + "','" + oSub.HEndDate.ToString() + "','" + oSub.HHCalibrationStatus.ToString() +"'"+
") ");
+ oCn.RunProc("update UPDATE from Gy_InspectInstruMent set HValidDate='" + oSub.HBeginDate + "',HExpiryDay='" + oSub.HEndDate + "'where HItemID="+ omodel.HInterID );
}
//=========================淇濆瓨鍚庢帶鍒�
- DataSet ds2 = oCn.RunProcReturn("Exec h_p_Sc_MouldRepairWorkBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1,1 ", "h_p_Sc_MouldRepairWorkBill_AfterSaveCtrl");
- if (ds2 == null)
- {
- sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
- oCn.RollBack();
- return false;
- }
+ //DataSet ds2 = oCn.RunProcReturn("Exec h_p_Sc_MouldRepairWorkBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1,1 ", "h_p_Sc_MouldRepairWorkBill_AfterSaveCtrl");
+
+
+ //if (ds2 == null)
+ //{
+ // sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+ // oCn.RollBack();
+ // return false;
+ //}
//if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
//{
// sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
index b64edae..e847783 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
@@ -14998,7 +14998,7 @@
try
{
List<object> columnNameList = new List<object>();
- if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBillList", 1, false, user))
+ if (!DBUtility.ClsPub.Security_Log("Gy_QCVerificationBillMain", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -15055,7 +15055,7 @@
public object DeltetGy_QCVerificationBillMain(string HInterID, string user)
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, false, user))
+ if (!DBUtility.ClsPub.Security_Log("Gy_QCVerificationBillMain_Delete", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -15160,7 +15160,7 @@
[HttpGet]
public object AuditQCVerificationBillMain(int HInterID, int IsAudit, string CurUserName)
{
- string ModRightNameCheck = "Sb_MouldRepairWorkBill_Check";
+ string ModRightNameCheck = "Gy_QCVerificationBillMain_Check";
DBUtility.ClsPub.CurUserName = CurUserName;
try
{
@@ -15395,7 +15395,7 @@
ListModels oListModels = new ListModels();
try
{
- if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Edit", 1, false, msg4))
+ if (!DBUtility.ClsPub.Security_Log("Gy_QCVerificationBillMain_Edit", 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index d081ba3..9ce4807 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -5,19 +5,18 @@
<NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
-<<<<<<< HEAD
-=======
+
<LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
->>>>>>> 3758c91a8f9b3ca8409da3a8fa5330d52e237a0f
+
<NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
-<<<<<<< HEAD
+
<NameOfLastUsedPublishProfile>D:\gz\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile17.pubxml</NameOfLastUsedPublishProfile>
-=======
+
<NameOfLastUsedPublishProfile>D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile16.pubxml</NameOfLastUsedPublishProfile>
->>>>>>> 3758c91a8f9b3ca8409da3a8fa5330d52e237a0f
+
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
--
Gitblit v1.9.1