From 64c68e8220ef2f59c0487c91954155d1e9dec49f Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 02 七月 2024 15:41:06 +0800
Subject: [PATCH] 修复批量保存报错
---
Model/生产管理/ClsSc_QualityReportBillSub.cs | 1
WebAPI/Properties/PublishProfiles/FolderProfile13.pubxml.user | 36 +++++++++---------
WebAPI/Controllers/生产管理/质量汇报单/Sc_QualityReportBillController.cs | 24 +++++++++---
3 files changed, 37 insertions(+), 24 deletions(-)
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_QualityReportBillSub.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_QualityReportBillSub.cs"
index 8bbbef5..35368e9 100644
--- "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_QualityReportBillSub.cs"
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_QualityReportBillSub.cs"
@@ -27,5 +27,6 @@
public DateTime HMakeDate;
public double HQty; //数量
public string HResult; //判断结果
+ public int HGroupID;//班组
}
}
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs"
index 0a94916..528228b 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs"
@@ -631,7 +631,7 @@
#region 鎻愪氦淇濆瓨锛屽瓨涓诲瓙琛ㄥ強鏄庣粏琛�
[Route("Sc_QualityReportBill/set_SaveBill")]
[HttpGet]
- public object set_SaveBill(long HInterID,string HBillNo, string HChecker,string HBadReasonHQty)
+ public object set_SaveBill(long HInterID,string HBillNo, string HChecker)
{
try
{
@@ -658,8 +658,18 @@
return objJsonResult;
}
//=========================================================
- //淇濆瓨
- oCN.RunProc("exec h_p_save_Sc_QualityReportBill " + HInterID+",'"+ HBadReasonHQty +"'");
+ //淇濆瓨 鎵归噺淇濆瓨鍏堢湅瀛愯〃鏄惁鏈夋暟鎹�,鏈夋暟鎹氨杩� 瀛樺叆涓昏〃 鏄庣粏琛� 娌℃湁灏卞瓨鍌ㄤ富瀛愭槑缁嗚〃
+ string sql = "select * from Sc_QualityReportBillSub where HInterID = '" + HInterID + "'";
+ ds = oCN.RunProcReturn(sql, "Sc_QualityReportBillSub");
+ if (ds.Tables[0].Rows.Count>0)
+ {
+ oCN.RunProc("exec h_p_save_Sc_QualityReportBillSum " + HInterID + "");
+ }
+ else
+ {
+ oCN.RunProc("exec h_p_save_Sc_QualityReportBill " + HInterID + "");
+ }
+
//鍒ゆ柇鏄惁鍏佽淇濆瓨锛屼笉鍏佽鍒欏洖婊�
ds = oCN.RunProcReturn("exec h_p_JIT_ICMOBillQualityStatus_SaveCtrl", "h_p_JIT_ICMOBillQualityStatus_SaveCtrl");
if (ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2")
@@ -780,7 +790,7 @@
string subSql = "Insert into Sc_QualityReportBillSub " +
" (HInterID,HEntryID,HBillNo_bak,HRemark" +
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
- ",HMaterID,HUnitID,HQty,HResult,HEmpID,HSourceID,HBadReasonID" +
+ ",HMaterID,HUnitID,HQty,HResult,HEmpID,HSourceID,HBadReasonID,HBadReasonNumber,HGroupID" +
",HICMOInterID,HICMOEntryID,HICMOBillNo,HProcExchInterID,HProcExchEntryID,HProcExchBillNo" +
",HBarCode,HReportType" +
",HAddr,HMaker,HMakeDate" +
@@ -803,6 +813,8 @@
"," + oSub.HEmpID.ToString() + "" +
"," + oSub.HSourceID.ToString() + "" +
"," + oSub.HBadReasonID.ToString() + "" +
+ ",'" + oSub.HBadReasonNumber.ToString() + "'" +
+ ",'" + oSub.HGroupID.ToString() + "'" +
"," + oSub.HICMOInterID.ToString() + "" +
"," + oSub.HICMOEntryID.ToString() + "" +
@@ -810,9 +822,9 @@
"," + oSub.HProcExchInterID + "" +
"," + oSub.HProcExchEntryID + "" +
",'" + oSub.HProcExchBillNo + "'" +
- ",'" + oSub.HBarCode + "'" +
+ ",'" + oSub.HBadReasonNumber.ToString() + "'" +
- ",'" + 3 +
+ ",'" + 1 +
"','" + oSub.HAddr + "'" +
",'" + msg4 + "'" +
",'" + oSub.HMakeDate.ToShortDateString() + "'" +
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile13.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile13.pubxml.user
index 228058f..5225f94 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile13.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile13.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2024-07-02T00:52:20.9683250Z;True|2024-07-01T15:34:19.0810024+08:00;True|2024-07-01T15:29:41.8587401+08:00;True|2024-07-01T15:06:46.7127992+08:00;True|2024-07-01T14:45:31.0703303+08:00;True|2024-07-01T14:13:18.0986061+08:00;True|2024-07-01T14:11:15.8643251+08:00;True|2024-07-01T13:29:59.6069813+08:00;True|2024-07-01T11:12:59.9147877+08:00;True|2024-07-01T10:22:37.9929084+08:00;True|2024-07-01T10:20:59.0844221+08:00;True|2024-07-01T10:17:38.9582335+08:00;True|2024-07-01T10:09:18.2084318+08:00;True|2024-07-01T10:08:49.4427785+08:00;True|2024-07-01T10:05:38.5373813+08:00;True|2024-07-01T09:47:53.4738455+08:00;</History>
+ <History>True|2024-07-02T07:30:13.0080212Z;True|2024-07-02T15:24:33.5742376+08:00;True|2024-07-02T15:20:38.4269558+08:00;True|2024-07-02T15:17:35.2560555+08:00;True|2024-07-02T15:04:07.6778856+08:00;True|2024-07-02T14:52:23.2500105+08:00;True|2024-07-02T14:44:10.5580566+08:00;True|2024-07-02T09:10:05.9974988+08:00;True|2024-07-02T08:52:20.9683250+08:00;True|2024-07-01T15:34:19.0810024+08:00;True|2024-07-01T15:29:41.8587401+08:00;True|2024-07-01T15:06:46.7127992+08:00;True|2024-07-01T14:45:31.0703303+08:00;True|2024-07-01T14:13:18.0986061+08:00;True|2024-07-01T14:11:15.8643251+08:00;True|2024-07-01T13:29:59.6069813+08:00;True|2024-07-01T11:12:59.9147877+08:00;True|2024-07-01T10:22:37.9929084+08:00;True|2024-07-01T10:20:59.0844221+08:00;True|2024-07-01T10:17:38.9582335+08:00;True|2024-07-01T10:09:18.2084318+08:00;True|2024-07-01T10:08:49.4427785+08:00;True|2024-07-01T10:05:38.5373813+08:00;True|2024-07-01T09:47:53.4738455+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
@@ -21,28 +21,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>07/02/2024 08:52:03</publishTime>
+ <publishTime>07/02/2024 15:30:05</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>07/02/2024 08:52:03</publishTime>
+ <publishTime>07/02/2024 15:30:05</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>07/02/2024 08:52:01</publishTime>
+ <publishTime>07/02/2024 15:30:04</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>07/02/2024 08:52:01</publishTime>
+ <publishTime>07/02/2024 15:30:04</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>07/02/2024 08:51:59</publishTime>
+ <publishTime>07/02/2024 15:30:01</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>07/02/2024 08:51:59</publishTime>
+ <publishTime>07/02/2024 15:30:01</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -87,10 +87,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>07/02/2024 08:51:59</publishTime>
+ <publishTime>07/02/2024 15:30:02</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>07/02/2024 08:51:59</publishTime>
+ <publishTime>07/02/2024 15:30:02</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>05/25/2024 09:46:41</publishTime>
@@ -123,25 +123,25 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>07/02/2024 08:51:57</publishTime>
+ <publishTime>07/02/2024 15:30:00</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>07/02/2024 08:51:57</publishTime>
+ <publishTime>07/02/2024 15:30:00</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>07/02/2024 08:51:57</publishTime>
+ <publishTime>07/02/2024 15:30:01</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>07/02/2024 08:51:57</publishTime>
+ <publishTime>07/02/2024 15:30:01</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>07/02/2024 08:51:58</publishTime>
+ <publishTime>07/02/2024 15:30:01</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>07/02/2024 08:51:58</publishTime>
+ <publishTime>07/02/2024 15:30:01</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
@@ -255,10 +255,10 @@
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>07/02/2024 08:52:11</publishTime>
+ <publishTime>07/02/2024 15:30:09</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>07/02/2024 08:52:11</publishTime>
+ <publishTime>07/02/2024 15:30:09</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -453,7 +453,7 @@
<publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Web.config">
- <publishTime>07/02/2024 08:52:20</publishTime>
+ <publishTime>07/02/2024 15:30:12</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1