From 849006246b7f433c7bd07c47e675cbccf878a8e9 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期一, 27 九月 2021 10:41:18 +0800
Subject: [PATCH] nothing
---
WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs | 104 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 70 insertions(+), 34 deletions(-)
diff --git a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs
index 4e87e69..07abf99 100644
--- a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs
+++ b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs
@@ -21,6 +21,8 @@
public DAL.ClsSc_MouldScrapInBill BillNew0 = new DAL.ClsSc_MouldScrapInBill(); //妯″叿鎶ュ簾鍏ュ簱瀵瑰簲鍗曟嵁绫�
public DAL.ClsSc_MouldScrapInBill BillOld0 = new DAL.ClsSc_MouldScrapInBill(); //妯″叿鎶ュ簾鍏ュ簱瀵瑰簲鍗曟嵁绫�
+ public DLL.ClsSc_MouldRepairInBill BillNew01 = new DLL.ClsSc_MouldRepairInBill(); //妯″叿鏀瑰埗鍏ュ簱瀵瑰簲鍗曟嵁绫�
+ public DLL.ClsSc_MouldRepairInBill BillOld01 = new DLL.ClsSc_MouldRepairInBill(); //妯″叿鏀瑰埗鍏ュ簱瀵瑰簲鍗曟嵁绫�
/// <summary>
/// 鏍规嵁鍖呰鍗� 杩斿洖姝ゅ寘瑁呭崟鍐呯殑鐩稿叧淇℃伅
@@ -4250,23 +4252,6 @@
#endregion
- #region[鍣ㄥ叿鏀瑰埗鍏ュ簱鍗曠紪杈戞椂鑾峰彇琛ㄥご鏁版嵁]
- [Route("Sc_MouldRepairInBill/Sc_MouldRepairInBillListCheckDetail")]
- [HttpGet]
- public ApiResult<DataSet> Sc_MouldRepairInBillListCheckDetail(string HID)
- {
- if (string.IsNullOrEmpty(HID))
- 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_MouldRepairInBillList where hmainid= " + HID + " ", "h_v_Sc_MouldRepairInBillList");
- if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
- return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄩ��搴撳崟鍙�" };
-
- return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
- }
- #endregion
-
#region[鍣ㄥ叿鏀瑰埗鍏ュ簱鍗曠紪杈戞椂鑾峰彇琛ㄤ綋鏁版嵁]
[Route("Sc_MouldRepairInBill/Sc_MouldRepairInBillListCheckDetai")]
[HttpGet]
@@ -4278,9 +4263,10 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (sqlWhere == null || sqlWhere.Equals(""))
{
- ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID 妯″叿浠ｇ爜,璁捐瀵垮懡,鍓╀綑瀵垮懡,绱Н浣跨敤瀵垮懡,HWHID 浠撳簱,
- HSPID 浠撲綅浠ｇ爜,妯″叿鏂拌鏍�,鏈�鍚庣敓浜т骇鍝�,閫�搴撶被鍨�,
- 琛ㄥご澶囨敞 FROM h_v_Sc_MouldRepairInBillList"), "h_v_Sc_MouldRepairInBillList");
+ ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,
+ 鎵规 HBatchNo,璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 浣跨敤瀵垮懡 HUseLife,搴旀敹鏁伴噺 HQtyMust,
+ 瀹炴敹鏁伴噺 HQty, HWHID, 浠撳簱浠ｇ爜 HWHCode,浠撳簱 HWHName,瀛愬娉� HRemark
+ FROM h_v_Sc_MouldRepairInBillList"), "h_v_Sc_MouldRepairInBillList");
objJsonResult.code = "0";
objJsonResult.count = 1;
@@ -4291,9 +4277,10 @@
{
//string sql1 = "select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark from Sc_MouldRepairCheckBillSub where 1 = 1 ";
- string sql1 = string.Format(@"SELECT HMaterID 妯″叿浠ｇ爜,璁捐瀵垮懡,鍓╀綑瀵垮懡,绱Н浣跨敤瀵垮懡,HWHID 浠撳簱,
- HSPID 浠撲綅浠ｇ爜,妯″叿鏂拌鏍�,鏈�鍚庣敓浜т骇鍝�,閫�搴撶被鍨�,
- 琛ㄥご澶囨敞 FROM h_v_Sc_MouldRepairInBillList where 1 = 1 ");
+ string sql1 = string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,
+ 鎵规 HBatchNo,璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 浣跨敤瀵垮懡 HUseLife,搴旀敹鏁伴噺 HQtyMust,
+ 瀹炴敹鏁伴噺 HQty, HWHID, 浠撳簱浠ｇ爜 HWHCode,浠撳簱 HWHName,瀛愬娉� HRemark
+ FROM h_v_Sc_MouldRepairInBillList where 1=1 ");
string sql = sql1 + sqlWhere;
ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldRepairInBillList");
@@ -4329,23 +4316,72 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
-
+ string refSav = sArray[2].ToString();
string UserName = "";
+ string s = "";
ListModels oListModels = new ListModels();
try
{
- DLL.ClsSc_MouldProdBackBill oBill = new DLL.ClsSc_MouldProdBackBill();
- List<Model.ClsSc_MouldProdBackBillMain> lsmain = new List<Model.ClsSc_MouldProdBackBillMain>();
+ DLL.ClsSc_MouldRepairInBill oBill = new DLL.ClsSc_MouldRepairInBill();
+ List<Models.ClsSc_MouldRepairInBillMain> lsmain = new List<Models.ClsSc_MouldRepairInBillMain>();
msg2 = msg2.Replace("\\", "");
msg2 = msg2.Replace("\n", ""); //\n
- lsmain = oListModels.getObjectByJson_Gy_MouldProdBackBillMain(msg2);
- foreach (Model.ClsSc_MouldProdBackBillMain oItem in lsmain)
+ lsmain = oListModels.getObjectByJson_Gy_MouldRepairInHouseBillMain(msg2);
+ foreach (Models.ClsSc_MouldRepairInBillMain oItem in lsmain)
{
+ if (refSav == "Add")
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (BillNew01.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld0.omodel.HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ if (refSav == "Update")
+ {
+ if (BillOld01.ShowBill(oItem.HInterID, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (BillOld0.omodel.HChecker != "" && BillOld0.omodel.HChecker != null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (BillOld0.omodel.HBillStatus > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹浜庝笉鍙紪杈戠姸鎬侊紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (!DBUtility.Xt_BaseBillFun.Fun_AllowEditBill(BillOld0, ref s))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s + "锛屼笉鍏佽淇敼";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
//oItem.HMaker = "";
UserName = oItem.HMaker; //鍒跺崟浜�
- oItem.HBillType = "3803";
- oItem.HBillSubType = "3803";
+ oItem.HBillType = "3826";
+ oItem.HBillSubType = "3826";
//oItem.HBillNo = ""; //鍗曟嵁鍙�
//oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
//oItem.HInnerBillNo = ""; // --鍐呴儴鍗曟嵁鍙�
@@ -4380,10 +4416,10 @@
msg3 = msg3.Replace("\\", "");
msg3 = msg3.Replace("\n", ""); //\n
//msg2 = msg2.Replace("'", "鈥�");
- List<Model.ClsSc_MouldProdBackBillSub> ls = new List<Model.ClsSc_MouldProdBackBillSub>();
- ls = oListModels.getObjectByJson_Gy_MouldProdBackBillSub(msg3);
+ List<Models.ClsSc_MouldRepairInBillSub> ls = new List<Models.ClsSc_MouldRepairInBillSub>();
+ ls = oListModels.getObjectByJson_Gy_MouldRepairInHouseBillSub(msg3);
int i = 0;
- foreach (Model.ClsSc_MouldProdBackBillSub oItemSub in ls)
+ foreach (Models.ClsSc_MouldRepairInBillSub oItemSub in ls)
{
i++;
@@ -4538,7 +4574,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_MouldProdInHouseBillList where hmainid= " + HID + " ", "h_v_Sc_MouldProdInHouseBillList");
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_MouldRepairInBillList where hmainid= " + HID + " ", "h_v_Sc_MouldRepairInBillList");
if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄥ崟鍙�" };
--
Gitblit v1.9.1