From 202eeec18cfb11c506c78d49b093fe3457045403 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期四, 09 九月 2021 15:46:07 +0800
Subject: [PATCH] 工序进站接收单、工序出站汇报单： 增加查询流转卡
---
DAL/生产管理/设备管理/ClsSb_EquipMaintainPlanBill.cs | 4 +-
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 34 ++++++++--------
WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs | 11 -----
WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs | 13 ------
WebAPI/Controllers/CJGL/Cj_StationInBillController.cs | 36 ++++++++++++++++++
5 files changed, 56 insertions(+), 42 deletions(-)
diff --git "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipMaintainPlanBill.cs" "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipMaintainPlanBill.cs"
index 9ad9ae9..9aa4d4a 100644
--- "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipMaintainPlanBill.cs"
+++ "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipMaintainPlanBill.cs"
@@ -45,7 +45,7 @@
",HYear='" + omodel.HYear.ToString() + "'" +
",HPeriod='" + omodel.HPeriod.ToString() + "'" +
",HRemark='" + omodel.HRemark + "'" +
- ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
+ ",HUpDater='" + omodel.HMaker + "'" +
",HUpDateDate=getdate()" +
//========================================
",HEquipID=" + omodel.HEquipID.ToString() +
@@ -123,7 +123,7 @@
",HYear,HPeriod,HRemark,HEquipID" +
",HBeginDate,HEndDate,HCheckCycle,HCycleUnit,HExplanation,HInnerBillNo" +
") "+
- " values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
+ " values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMaker + "',getdate()" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'," + omodel.HEquipID.ToString() +
",'" + omodel.HBeginDate +"','" +omodel.HEndDate + "'," + omodel.HCheckCycle.ToString() +",'"+ omodel.HCycleUnit + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo +"'" +
") ");
diff --git a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
index 6b7bd8d..2e2beea 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
@@ -867,5 +867,41 @@
}
}
#endregion
+
+ //#region 鏌ョ湅宸ュ簭娴佽浆鍗″叧鑱旀暟閲忓垪琛ㄥ姞杞�
+ [Route("Cj_StationInBill/GetStationQtyList")]
+ [HttpGet]
+ public object GetStationQtyList(string HInterID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("execute h_p_Sc_ProcExchBilltransRelationQty @HInterID=" + HInterID, "h_p_Sc_ProcExchBilltransRelationQty");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁浣犺鎵剧殑璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //#endregion
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs
index f09c549..d8a9b7a 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs
@@ -236,24 +236,13 @@
#endregion
#region [璁惧淇濆吇璁″垝琛ㄥ垹闄ゅ姛鑳絔
/// <summary>
- /// 妯″叿缁翠慨鍗曞垹闄ゅ姛鑳�
+ /// 璁惧淇濆吇璁″垝琛ㄥ垹闄ゅ姛鑳�
/// </summary>
/// <returns></returns>
[Route("Sb_EquipMaintainPlanBill/DeltetEquipMaintainPlanBillList")]
[HttpGet]
public object DeltetEquipMaintainPlanBillList(string HInterID)
{
- //缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
-
-
Int64 lngBillKey = 0;
lngBillKey = DBUtility.ClsPub.isLong(HInterID);
if (lngBillKey == 0)
diff --git a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
index dedfd6e..b231324 100644
--- a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
+++ b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
@@ -2733,17 +2733,6 @@
[HttpGet]
public object DeltetSc_MouldMaintainBill(string HInterID)
{
- //缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
-
-
Int64 lngBillKey = 0;
lngBillKey = DBUtility.ClsPub.isLong(HInterID);
if (lngBillKey == 0)
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index d30da52..6d6b732 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -18,25 +18,25 @@
<publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>09/08/2021 11:19:08</publishTime>
+ <publishTime>09/09/2021 11:28:36</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>09/08/2021 11:19:08</publishTime>
+ <publishTime>09/09/2021 11:28:36</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>09/08/2021 11:19:06</publishTime>
+ <publishTime>09/09/2021 11:28:33</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>09/08/2021 11:19:06</publishTime>
+ <publishTime>09/09/2021 11:28:33</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 14:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>09/08/2021 11:19:03</publishTime>
+ <publishTime>09/09/2021 11:28:27</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>09/08/2021 11:19:03</publishTime>
+ <publishTime>09/09/2021 11:28:27</publishTime>
</File>
<File Include="bin/Interop.gregn6Lib.dll">
<publishTime>08/25/2021 10:28:25</publishTime>
@@ -60,10 +60,10 @@
<publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>09/08/2021 11:19:03</publishTime>
+ <publishTime>09/09/2021 11:28:28</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>09/08/2021 11:19:03</publishTime>
+ <publishTime>09/09/2021 11:28:28</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>08/16/2021 17:23:15</publishTime>
@@ -72,22 +72,22 @@
<publishTime>08/03/2014 20:33:56</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>09/08/2021 11:19:02</publishTime>
+ <publishTime>09/09/2021 11:28:24</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>09/08/2021 11:19:02</publishTime>
+ <publishTime>09/09/2021 11:28:24</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>09/08/2021 11:19:02</publishTime>
+ <publishTime>09/09/2021 11:28:25</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>09/08/2021 11:19:02</publishTime>
+ <publishTime>09/09/2021 11:28:25</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>09/08/2021 11:19:02</publishTime>
+ <publishTime>09/09/2021 11:28:26</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>09/08/2021 11:19:02</publishTime>
+ <publishTime>09/09/2021 11:28:26</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</publishTime>
@@ -189,10 +189,10 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>09/08/2021 11:19:11</publishTime>
+ <publishTime>09/09/2021 11:28:42</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>09/08/2021 11:19:11</publishTime>
+ <publishTime>09/09/2021 11:28:42</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/17/2013 17:03:52</publishTime>
@@ -363,7 +363,7 @@
<publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web.config">
- <publishTime>09/08/2021 11:19:19</publishTime>
+ <publishTime>09/09/2021 11:28:52</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1