MES-WEB-API.git

			@@ -1244,6 +1244,8 @@
			}
			//==================================================================================

			//更新及时库存表减少调入库存,增加调出库存
			ds = oCN.RunProcReturn("exec h_KF_UPDateICinventory_Move '"+ oBill.omodel.HInterID + "','"+ oBill.omodel.HBillType+ "','1'", "h_KF_UPDateICinventory_Move");

			//审核单据
			if (!oBill.CheckBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Kf_MoveStockBill_AfterCheckCtrl", user, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			@@ -1296,6 +1298,8 @@
			}
			//===========================================================

			//更新及时库存表增加调入库存,减少调出库存
			ds = oCN.RunProcReturn("exec h_KF_UPDateICinventory_Move '" + oBill.omodel.HInterID + "','" + oBill.omodel.HBillType + "','2'", "h_KF_UPDateICinventory_Move");

			//反审核单据
			if (oBill.AbandonCheck(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Kf_MoveStockBill_AfterUnCheckCtrl", user, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			@@ -1856,7 +1860,7 @@
			if (ds == null \|\| ds.Tables.Count == 0 \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.count = 0;
			objJsonResult.Message = "删除失败!原因:删除前判断失败，请与网络管理人员联系";
			objJsonResult.data = null;
			return objJsonResult;
			@@ -1865,7 +1869,7 @@
			if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.count = 0;
			objJsonResult.Message = "删除失败!原因:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
			objJsonResult.data = null;
			return objJsonResult;
			@@ -1890,11 +1894,11 @@
			oCN.RunProc("exec h_p_Xs_UpDateRelation_SeOutStockToPOStockIn_Delete " + HInterID);


			//oCN.RunProc("Delete From Kf_ICStockBillMain where HInterID = " + HInterID);
			//oCN.RunProc("Delete From Kf_ICStockBillSub where HInterID = " + HInterID);
			oCN.RunProc("Delete From Kf_ICStockBillMain where HInterID = " + HInterID);
			oCN.RunProc("Delete From Kf_ICStockBillSub where HInterID = " + HInterID);

			string sql = "exec h_p_WMS_ICStockBillAndWMS_Delete " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','1205'";
			oCn.RunProc(sql);
			//string sql = "exec h_p_WMS_ICStockBillAndWMS_Delete " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','1205'";
			//oCn.RunProc(sql);

			//删除后控制==================================================================================
			string sql2 = "exec h_p_Kf_SellOutBill_AfterDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
			@@ -1903,7 +1907,7 @@
			{
			s = "删除后判断失败，请与网络管理人员联系";
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.count = 0;
			objJsonResult.Message = "删除失败!原因:" + s;
			objJsonResult.data = null;
			oCN.RollBack();
			@@ -1913,7 +1917,7 @@
			{
			s = ds.Tables[0].Rows[0]["HRemark"].ToString();
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.count = 0;
			objJsonResult.Message = "删除失败!原因:" + s;
			objJsonResult.data = null;
			oCN.RollBack();
			@@ -3296,7 +3300,6 @@
			}
			//==================================================================================


			//审核单据
			if (!oBill.CheckBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Kf_ICStockBill_AfterCheckCtrl", user, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			{
			@@ -3347,7 +3350,6 @@
			return objJsonResult;
			}
			//===========================================================


			//反审核单据
			if (oBill.AbandonCheck(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Kf_ICStockBill_AfterUnCheckCtrl", user, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			@@ -5583,6 +5585,142 @@
			}
			#endregion

			#region 模具保养记录表保存/编辑PDA
			/// <summary>
			/// 保存模具维修单
			/// </summary>
			/// <param name="msg"></param>
			/// <returns></returns>
			[Route("Sc_MouldMaintainBill/SaveGetMouldMaintainBillListPDA")]
			[HttpPost]
			public object SaveGetMouldMaintainBillListPDA([FromBody] JObject msg)
			{
			var _value = msg["msg"].ToString();
			string msg1 = _value.ToString();
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string msg3 = sArray[1].ToString();
			string msg5 = sArray[2].ToString();

			string UserName = "";
			ListModels oListModels = new ListModels();
			try
			{
			if (!DBUtility.ClsPub.Security_Log("Sc_MouldMaintainBill_Edit", 1, false, msg5))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无保存权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			DAL.ClsSc_MouldMaintainBill oBill = new DAL.ClsSc_MouldMaintainBill();
			List<Model.ClsSc_MouldMaintainBillMain> lsmain = new List<Model.ClsSc_MouldMaintainBillMain>();
			msg2 = msg2.Replace("\\", "");
			msg2 = msg2.Replace("\n", ""); //\n
			lsmain = oListModels.getObjectByJson_Sc_MouldMaintainBillMain(msg2);
			foreach (Model.ClsSc_MouldMaintainBillMain oItem in lsmain)
			{
			UserName = oItem.HMaker; //制单人
			DBUtility.ClsPub.CurUserName = UserName;
			oItem.HBillType = "3819";
			oItem.HBillSubType = "3819";

			//oItem.HInterID =0;
			//oItem.HBillNo = "";
			oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --日期
			oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
			//oItem.HMakeDate = "";
			//oItem.HYear = "";
			//oItem.HPeriod = "";
			//oItem.HRemark = "";
			//oItem.HCycleUnit = "";
			//oItem.HCheckCycle = "";
			//oItem.HBeginDate = "";
			//oItem.HEndDate = "";
			//oItem.HInnerBillNo = "";
			//oItem.HExplanation = "";

			//oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
			if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！没有单据日期，无法保存！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			oBill.omodel = oItem;
			}
			//保养项表体数据
			//按 },{来拆分数组 //去掉【和】
			msg3 = msg3.Substring(1, msg3.Length - 2);
			msg3 = msg3.Replace("\\", "");
			msg3 = msg3.Replace("\n", ""); //\n
			//msg2 = msg2.Replace("'", "’");
			List<Model.ClsSc_MouldMaintainRuleBillSub_Item> ls = new List<Model.ClsSc_MouldMaintainRuleBillSub_Item>();
			ls = oListModels.getObjectByJson_Sc_MouldMaintainRuleBillSub_Item(msg3);
			int i = 0;
			foreach (Model.ClsSc_MouldMaintainRuleBillSub_Item oItemSub in ls)
			{

			i++;
			oItemSub.HEntryID = i;
			//oItemSub.HCloseMan = ""; //行关闭
			oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
			oItemSub.HCloseType = false; //关闭类型
			//oItemSub.HRemark = ""; //备注
			oItemSub.HSourceInterID = 0; // 源单主内码
			oItemSub.HSourceEntryID = 0; //源单子内码
			//oItemSub.HSourceBillNo = ""; //源单单号
			//oItemSub.HSourceBillType = ""; //源单类型
			oItemSub.HRelationQty = 0; //关联数量
			oBill.DetailCol.Add(oItemSub);

			}

			//保存
			//保存完毕后处理
			bool bResult;
			if (oBill.omodel.HInterID == 0)
			{
			// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			}
			else
			{
			bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
			}
			if (bResult)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存成功！";
			//WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
			objJsonResult.data = 1;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！" + e.ToString();
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}
			#endregion

			#region[模具保养记录表编辑时获取表头数据]
			[Route("Sc_MouldMaintainBill/Sc_MouldMaintainBillListCheckDetai")]
			[HttpGet]
			@@ -5658,7 +5796,7 @@
			}
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			//获取保养项目编辑数据
			string sql = "select HMaintainItemID, 保养项目代码 HMaintainItemNumber,保养项目名称 HMaintainItem,保养部位 HMaintainPart,具体要求 HClaim,HManagerID,负责人代码 HManagerNumber,负责人 HManagerName,表体备注 HRemark from h_v_Sc_MouldMaintainBillListItem where 1 = 1 " + Swhere + "";
			string sql = "select HMaintainItemID, 保养项目代码 HMaintainItemNumber,保养项目名称 HMaintainItem,保养部位 HMaintainPart,具体要求 HClaim,HManagerID,负责人代码 HManagerNumber,负责人 HManagerName,表体备注 HRemark,保养结果 HMaintainResult from h_v_Sc_MouldMaintainBillListItem where 1 = 1 " + Swhere + "";
			ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldMaintainBillListItem");
			//获取配件项目编辑数据
			string sql1 = "select HMaterID, 配件代码 HMaterNumber,配件名称 HMaterName,规格型号 HMaterSpec,HUnitID,单位代码 HUnitNumber,单位名称 HUnitName,实际用量 HQty,标准用量 HQtyMust,HManagerID,负责人代码 HManagerNumber,负责人 HManagerName,表体备注 HRemark from h_v_Sc_MouldMaintainBillList where 1 = 1 " + Swhere + "";
			@@ -6739,7 +6877,7 @@
			return objJsonResult;
			}
			//得到信息
			ds = oCN.RunProcReturn("select top 1 * from Gy_MouldFileMain where HNumber= '" + HBarCode + "'", "Gy_MouldFileMain");
			ds = oCN.RunProcReturn("select top 1 * from Gy_MouldFileMain where HBarCode= '" + HBarCode + "'", "Gy_MouldFileMain");
			//写入信息
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{