From 98ac927fc8c2480e504bd72cfe5354d6c110ecd1 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 10 七月 2024 18:17:34 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/品质管理/检验取样还样单/QC_TakeSampleCheckBillController.cs | 10 +++++-----
WebAPI/Properties/PublishProfiles/FolderProfile14.pubxml.user | 36 ++++++++++++++++++------------------
2 files changed, 23 insertions(+), 23 deletions(-)
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\346\243\200\351\252\214\345\217\226\346\240\267\350\277\230\346\240\267\345\215\225/QC_TakeSampleCheckBillController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\346\243\200\351\252\214\345\217\226\346\240\267\350\277\230\346\240\267\345\215\225/QC_TakeSampleCheckBillController.cs"
index 5105084..c2fed8d 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\346\243\200\351\252\214\345\217\226\346\240\267\350\277\230\346\240\267\345\215\225/QC_TakeSampleCheckBillController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\346\243\200\351\252\214\345\217\226\346\240\267\350\277\230\346\240\267\345\215\225/QC_TakeSampleCheckBillController.cs"
@@ -1251,7 +1251,7 @@
return objJsonResult;
}
- if (BillOld.ShowBill(long.Parse(HInterID), ref s) == false)
+ if (BillOld1.ShowBill(long.Parse(HInterID), ref s) == false)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -1260,7 +1260,7 @@
return objJsonResult;
}
//鍒ゆ柇鏄惁鍙垹闄�
- if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
+ if (BillOld1.omodel.HChecker != "" && BillOld1.omodel.HChecker != null)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -1269,7 +1269,7 @@
return objJsonResult;
}
//鍒ゆ柇鏄惁鏄垱寤虹姸鎬佽繘琛屽垹闄�
- if (int.Parse(BillOld.omodel.HBillStatus.ToString()) <= 1)
+ if (int.Parse(BillOld1.omodel.HBillStatus.ToString()) <= 1)
{
//杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
int sYear = 0;
@@ -1282,7 +1282,7 @@
}
//鍒犻櫎鍓嶆帶鍒�=========================================
- string sql1 = "exec h_p_QC_BackSampleCheckBill_BeforeDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
+ string sql1 = "exec h_p_QC_BackSampleCheckBill_BeforeDelCtrl " + BillOld1.omodel.HInterID + ",'" + BillOld1.omodel.HBillNo + "','" + user + "'";
ds = oCN.RunProcReturn(sql1, "h_p_QC_BackSampleCheckBill_BeforeDelCtrl");
if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
{
@@ -1311,7 +1311,7 @@
oCN.RunProc("delete from QC_BackSampleCheckBillSub where HInterID= " + HInterID);
//鍒犻櫎鍚庢帶鍒�==================================================================================
- string sql2 = "exec h_p_QC_BackSampleCheckBill_AfterDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
+ string sql2 = "exec h_p_QC_BackSampleCheckBill_AfterDelCtrl " + BillOld1.omodel.HInterID + ",'" + BillOld1.omodel.HBillNo + "','" + user + "'";
ds = oCN.RunProcReturn(sql2, "h_p_QC_BackSampleCheckBill_AfterDelCtrl");
if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
{
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile14.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile14.pubxml.user
index c20e0e1..34fb96e 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile14.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile14.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-10T05:44:55.6004881Z;True|2024-07-10T11:06:41.4657993+08:00;True|2024-07-10T11:06:14.2046277+08:00;True|2024-07-09T17:00:11.3098766+08:00;True|2024-07-09T16:52:34.1330415+08:00;True|2024-07-09T16:41:08.5428012+08:00;True|2024-07-09T16:38:45.6135989+08:00;True|2024-07-09T16:37:08.4743511+08:00;True|2024-07-09T15:41:15.0233394+08:00;True|2024-07-09T14:44:03.0473735+08:00;True|2024-07-09T14:34:31.6590139+08:00;True|2024-07-09T10:38:29.2075409+08:00;True|2024-07-08T15:39:48.6830620+08:00;True|2024-07-08T15:38:36.2214537+08:00;True|2024-07-08T15:35:34.5004806+08:00;True|2024-07-08T15:26:55.4570540+08:00;True|2024-07-08T12:07:22.9712713+08:00;</History>
+ <History>True|2024-07-10T07:01:02.3675403Z;True|2024-07-10T13:44:55.6004881+08:00;True|2024-07-10T11:06:41.4657993+08:00;True|2024-07-10T11:06:14.2046277+08:00;True|2024-07-09T17:00:11.3098766+08:00;True|2024-07-09T16:52:34.1330415+08:00;True|2024-07-09T16:41:08.5428012+08:00;True|2024-07-09T16:38:45.6135989+08:00;True|2024-07-09T16:37:08.4743511+08:00;True|2024-07-09T15:41:15.0233394+08:00;True|2024-07-09T14:44:03.0473735+08:00;True|2024-07-09T14:34:31.6590139+08:00;True|2024-07-09T10:38:29.2075409+08:00;True|2024-07-08T15:39:48.6830620+08:00;True|2024-07-08T15:38:36.2214537+08:00;True|2024-07-08T15:35:34.5004806+08:00;True|2024-07-08T15:26:55.4570540+08:00;True|2024-07-08T12:07:22.9712713+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/10/2024 13:44:33</publishTime>
+ <publishTime>07/10/2024 15:00:41</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>07/10/2024 13:44:33</publishTime>
+ <publishTime>07/10/2024 15:00:41</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>07/10/2024 13:44:31</publishTime>
+ <publishTime>07/10/2024 15:00:40</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>07/10/2024 13:44:31</publishTime>
+ <publishTime>07/10/2024 15:00:40</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>07/10/2024 13:44:29</publishTime>
+ <publishTime>07/10/2024 15:00:37</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>07/10/2024 13:44:29</publishTime>
+ <publishTime>07/10/2024 15:00:37</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/10/2024 13:44:29</publishTime>
+ <publishTime>07/10/2024 15:00:38</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>07/10/2024 13:44:29</publishTime>
+ <publishTime>07/10/2024 15:00:38</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/10/2024 13:44:27</publishTime>
+ <publishTime>07/10/2024 15:00:35</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>07/10/2024 13:44:27</publishTime>
+ <publishTime>07/10/2024 15:00:35</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>07/10/2024 13:44:28</publishTime>
+ <publishTime>07/10/2024 15:00:36</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>07/10/2024 13:44:28</publishTime>
+ <publishTime>07/10/2024 15:00:36</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>07/10/2024 13:44:28</publishTime>
+ <publishTime>07/10/2024 15:00:37</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>07/10/2024 13:44:28</publishTime>
+ <publishTime>07/10/2024 15:00:37</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/10/2024 13:44:39</publishTime>
+ <publishTime>07/10/2024 15:00:46</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>07/10/2024 13:44:39</publishTime>
+ <publishTime>07/10/2024 15:00:46</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/10/2024 13:44:54</publishTime>
+ <publishTime>07/10/2024 15:01:01</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1