~yxj/MES-WEB-API.git

			@@ -1,4 +1,5 @@
			using Newtonsoft.Json.Linq;
			using Newtonsoft.Json;
			using Newtonsoft.Json.Linq;
			using Pub_Class;
			using System;
			using System.Collections;
			@@ -99,7 +100,7 @@
			double HMoney = 0;
			double HBadCount = list[0].HBadCount;//不良数量
			long HCenterID = list[0].HCenterID;//工作中心ID
			long HProcNo = list[0].HProcNo;//流水号
			string HProcNo = list[0].HProcNo;//流水号
			string HOrderProcNO = list[0].HOrderProcNO;//订单跟踪号
			string HSourceNameList = list[0].HSourceNameList;//设备清单
			long HMainSourceInterID = list[0].HInterID;//递入type得到的单据ID
			@@ -115,6 +116,7 @@
			double HPriceRate = list[0].HPriceRate;//系数
			double HWorkTimes = list[0].HWorkTimes;//工时
			long HQCCheckID = list[0].HQCCheckID;//检验员ID
			long HPRDOrgID = list[0].HPRDOrgID;//组织ID
			//单据完整性判断
			if (HProcExchInterID <= 0)
			{
			@@ -132,7 +134,7 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (HProcNo <= 0)
			if (HProcNo == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -213,6 +215,7 @@
			objJsonResult.data = null;
			return objJsonResult;
			}

			//if (HWorkTimes <= 0)
			//{
			// objJsonResult.code = "0";
			@@ -253,10 +256,13 @@
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			var num = 0;

			//若MAINDI重复则重新获取
			oCN.BeginTran();
			if ("Add".Equals(eventType))
			{
			num = 1;
			if (!AllowbillNo(HBillNo))
			{
			oCN.RollBack();
			@@ -274,7 +280,7 @@
			",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate,HSourceID2,HSourceID3,HSourceID4,HSourceID5" +
			",HSupID,HQty,HPrice,HMoney,HBadCount,HCenterID,HProcNo,HOrderProcNO,HSourceNameList" +
			",HMainSourceInterID,HMainSourceBillNo,HMainSourceBillType,HLastSubProc" +
			",HEmpID2,HEmpID3,HEmpID4,HEmpID5,HDSQty,HChongQty,HPriceRate,HWorkTimes,HQCCheckID,HMainInterID" +
			",HEmpID2,HEmpID3,HEmpID4,HEmpID5,HDSQty,HChongQty,HPriceRate,HWorkTimes,HQCCheckID,HMainInterID,HPRDOrgID" +
			") " +
			" values('" + BillType + "','" + HBillSubType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate(),'" + HMouldNum + "'" +
			"," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HSourceName + "'," + HPieceQty + "," + HWasterQty + "," + HPlanPieceQty + "," + HBadPNL +
			@@ -283,11 +289,12 @@
			"," + HGroupID + "," + HDeptID + "," + HEmpID + ",'" + HBarCode + "','" + HAddr + "','" + HBarCodeMaker + "',getdate()" + "," + HSourceID2 + "," + HSourceID3 + "," + HSourceID4 + "," + HSourceID5 +
			"," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HBadCount + "," + HCenterID + "," + HProcNo + ",'" + HOrderProcNO + "'" + ",'" + HSourceNameList + "'" +
			"," + HMainSourceInterID + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'," + Convert.ToString(HLastSubProc ? 1 : 0) +
			"," + HEmpID2 + "," + HEmpID3 + "," + HEmpID4 + "," + HEmpID5 + "," + HDSQty + "," + HChongQty + "," + HPriceRate + "," + HWorkTimes + "," + HQCCheckID + "," + HMainInterID +
			"," + HEmpID2 + "," + HEmpID3 + "," + HEmpID4 + "," + HEmpID5 + "," + HDSQty + "," + HChongQty + "," + HPriceRate + "," + HWorkTimes + "," + HQCCheckID + "," + HMainInterID + "," + HPRDOrgID +
			") ");
			}
			else if ("Modify".Equals(eventType))
			{
			num = 2;
			oCN.RunProc("UpDate Sc_StationOutBillMain set " +
			"HUpDater='" + HMaker + "'" +
			",HUpDateDate=getdate()" +
			@@ -356,7 +363,7 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_Out " + HInterID + ",1");
			oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_Out " + HInterID + ","+ num + "");
			oCN.RunProc("exec h_p_Mes_ProcessExchangeChangeStatus " + HInterID + " ");
			oCN.RunProc("exec h_p_Mes_StationOutBillBackBarCode " + HInterID + " ");
			//判断是否是末道工序
			@@ -392,6 +399,7 @@
			}
			catch (Exception e)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			@@ -489,7 +497,7 @@
			oBill.omodel.HMainSourceInterID = list[i].HMainSourceInterID;
			oBill.omodel.HMainSourceBillNo = list[i].HMainSourceBillNo;
			oBill.omodel.HMainSourceBillType = list[i].HMainSourceBillType;
			oBill.omodel.HLastSubProc = list[i].HLastSubProc;
			oBill.omodel.HLastSubProc = true;
			oBill.omodel.HEmpID2 = list[i].HEmpID2;
			oBill.omodel.HEmpID3 = list[i].HEmpID3;
			oBill.omodel.HEmpID4 = list[i].HEmpID4;
			@@ -499,6 +507,7 @@
			oBill.omodel.HPriceRate = list[i].HPriceRate;
			oBill.omodel.HWorkTimes = list[i].HWorkTimes;
			oBill.omodel.HQCCheckID = list[i].HQCCheckID;
			oBill.omodel.HMaker = msg4;

			//string HBillSubType = "3791";
			//long HInterID = list[0].HInterID;//递入type得到的单据ID
			@@ -567,6 +576,7 @@
			bool bResult;
			// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			oCN.RunProc($"update Sc_StationOutBillMain set HMaker='{msg4}' where HInterID={oBill.omodel.HInterID}");
			i++;
			//if (bResult)
			//{
			@@ -700,6 +710,7 @@
			{
			try
			{
			List<object> columnNameList = new List<object>();
			//判断是否有查询权限
			if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Query", 1, false, user))
			{
			@@ -721,11 +732,20 @@
			ds = oCN.RunProcReturn(sql, "h_v_MES_StationOutBillList");
			}

			//添加列名
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}

			//if (ds.Tables[0].Rows.Count != 0 \|\| ds != null)
			//{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.list = columnNameList;
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			//}