From 59fda4a3b895b1246d1014ef02848e56ed6ca31e Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期二, 14 九月 2021 17:41:50 +0800
Subject: [PATCH] 模器具采购入库单列表，新增了DLL下的MouldProdInBill类和MouldProdInBillController
---
WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs | 153 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 146 insertions(+), 7 deletions(-)
diff --git a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
index b231324..52f0a06 100644
--- a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
+++ b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
@@ -4064,6 +4064,145 @@
}
#endregion
+ #region [妯″叿澶勭悊鍑哄簱鍗曞鏍搞�佸弽瀹℃牳]
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Sc_MouldScrapOutHouseBill/AuditMouldScrapOutList")]
+ [HttpGet]
+ public object AuditMouldScrapOutList(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "Sc_MouldScrapOutBill_Check";
+ DBUtility.ClsPub.CurUserName = CurUserName;
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID灏忎簬0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID);
+ DLL.ClsSc_MouldScrapOutBill oBill = new DLL.ClsSc_MouldScrapOutBill();
+ //鏌ョ湅鏄惁宸插鏍�,鍏抽棴,浣滃簾
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ if (oBill.omodel.HCloseMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HDeleteMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ if (oBill.omodel.HChecker.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ if (oBill.omodel.HChecker.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (IsAudit == 0) //瀹℃牳鎻愪氦
+ {
+ //瀹℃牳鎻愪氦
+ if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍告彁浜�
+ {
+ //鍙嶅鏍告彁浜bandonCheck
+ if (oBill.AbandonCheck(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#endregion
#region 妯″叿閫�搴撳崟
@@ -4098,13 +4237,13 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldProdBackBillList_Edit ", "h_v_Sc_MouldProdBackBillList_Edit");
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldProdBackBillList ", "h_v_Sc_MouldProdBackBillList");
}
else
{
- string sql1 = "select * from h_v_Sc_MouldProdBackBillList_Edit where 1 = 1 ";
+ string sql1 = "select * from h_v_Sc_MouldProdBackBillList where 1 = 1 ";
string sql = sql1 + sWhere;
- return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldProdBackBillList_Edit");
+ return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldProdBackBillList");
}
}
@@ -4120,7 +4259,7 @@
return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_MouldProdBackBillList_Edit where hmainid= " + HID + " ", "h_v_Sc_MouldProdBackBillList_Edit");
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_MouldProdBackBillList where hmainid= " + HID + " ", "h_v_Sc_MouldProdBackBillList");
if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄩ��搴撳崟鍙�" };
@@ -4143,7 +4282,7 @@
HUnitID, 璁￠噺鍗曚綅浠ｇ爜 HUnitCode, 璁￠噺鍗曚綅鍚嶇О HUnitName, 鎵规 HBatchNo,
璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 绱Н浣跨敤瀵垮懡 HUseLife,搴旀敹鏁伴噺 HQtyMust, 瀹炴敹鏁伴噺 HQty, 鍗曚环 HPrice, 閲戦 HMoney, HWHID1 HWHID, 鏀舵枡浠撳簱浠ｇ爜 HWHCode, 鏀舵枡浠撳簱鍚嶇О HWHName,
HSPID, 浠撲綅浠ｇ爜 HSPCode, 浠撲綅鍚嶇О HSPName,妯″叿鏂拌鏍� HNewModel,澹佸帤 HWallThickness,纭害 HHardness,鏈�鍚庣敓浜т骇鍝� HLastProdModel, 鐩村緞 HDiameter,閫�搴撶被鍨� HBackFlag,
- 琛ㄤ綋澶囨敞 HRemark FROM h_v_Sc_MouldProdBackBillList_Edit"), "h_v_Sc_MouldProdBackBillList_Edit");
+ 琛ㄤ綋澶囨敞 HRemark FROM h_v_Sc_MouldProdBackBillList"), "h_v_Sc_MouldProdBackBillList");
objJsonResult.code = "0";
objJsonResult.count = 1;
@@ -4158,9 +4297,9 @@
HUnitID, 璁￠噺鍗曚綅浠ｇ爜 HUnitCode, 璁￠噺鍗曚綅鍚嶇О HUnitName, 鎵规 HBatchNo,
璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 绱Н浣跨敤瀵垮懡 HUseLife,搴旀敹鏁伴噺 HQtyMust, 瀹炴敹鏁伴噺 HQty, 鍗曚环 HPrice, 閲戦 HMoney, HWHID1 HWHID, 鏀舵枡浠撳簱浠ｇ爜 HWHCode, 鏀舵枡浠撳簱鍚嶇О HWHName,
HSPID, 浠撲綅浠ｇ爜 HSPCode, 浠撲綅鍚嶇О HSPName,妯″叿鏂拌鏍� HNewModel,澹佸帤 HWallThickness,纭害 HHardness,鏈�鍚庣敓浜т骇鍝� HLastProdModel, 鐩村緞 HDiameter,閫�搴撶被鍨� HBackFlag,
- 琛ㄤ綋澶囨敞 HRemark FROM h_v_Sc_MouldProdBackBillList_Edit where 1 = 1 ");
+ 琛ㄤ綋澶囨敞 HRemark FROM h_v_Sc_MouldProdBackBillList where 1 = 1 ");
string sql = sql1 + sqlWhere;
- ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldProdBackBillList_Edit");
+ ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldProdBackBillList");
objJsonResult.code = "0";
objJsonResult.count = 1;
--
Gitblit v1.9.1