MES-WEB-API.git

			@@ -98,6 +98,8 @@
			public long HSouceInterID = 0;//HSourceInterIDCol
			public long HSourceEntryID = 0;//HSourceEntryIDCol
			public int? 叫料数量 = 0;//HBHGQtyCol
			public int? 已叫料数量 = 0;//HBHGQtyCol
			public int? 已配送数量 = 0;//HBHGQtyCol
			public double? 退料数量 = 0;//退料数量
			public long HSTOCKID = 0;//HSTOCKID
			public string 退料原因 { get; set; }//退料原因
			@@ -183,6 +185,15 @@
			{
			if (listCa[i].HMaterialID != 0 && listCa[i].叫料数量 > 0)
			{
			if (listCa[i].叫料数量 > listCa[i].计划发料数量)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "叫料数量大于计划发料数量!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			j = 1;

			var txtHBillNo = DBUtility.ClsPub.CreateBillCode_Prod(CallGoodsBill.ModName, ref DBUtility.ClsPub.sExeReturnInfo, true);//获得一个新的单据号
			@@ -272,7 +283,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无任何叫料数量，无法叫料!";
			objJsonResult.Message = "无任何叫料数量或叫料数量小于0，无法叫料!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -374,6 +385,27 @@
			{
			if (listCa[i].退料数量 > 0)
			{
			if (listCa[i].退料数量 > listCa[i].已配送数量)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "退料数量大于已配送数量!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			ds = oCN.RunProcReturn("select sum(HQty) from JIT_CallGoodsBackRequestBillSub " +
			$"where HSourceInterID={listCa[i].HSouceInterID} and HSourceEntryID ={listCa[i].HSourceEntryID} and HSourceBillNo = '{listCa[i].HSourceBillNo}' and HMaterID={listCa[i].HMaterialID}", "JIT_CallGoodsBackRequestBillSub");

			if ((double.Parse(ds.Tables[0].Rows[0][0].ToString()==""?"0": ds.Tables[0].Rows[0][0].ToString()) +listCa[i].退料数量) > listCa[i].已叫料数量)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = $"已经退料申请数量:{double.Parse(ds.Tables[0].Rows[0][0].ToString())},可退料数量为:{(listCa[i].已叫料数量 - double.Parse(ds.Tables[0].Rows[0][0].ToString()))}!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			flag = AddICStockTuiBill(listCa[i], "666601", "不良品退料", HOrgID, ref DBUtility.ClsPub.sExeReturnInfo);
			j = 1;
			}
			@@ -382,7 +414,7 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无任何退料数量，无法退料!";
			objJsonResult.Message = "无任何退料数量或退料数量小于0，无法退料!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -419,14 +451,13 @@
			{
			try
			{

			Int64 lngBillKey = listCa.HSouceInterID == 0 ? 0 : listCa.HSouceInterID;
			Int64 lngBillKeyEntry = listCa.HSourceEntryID == 0 ? 0 : listCa.HSourceEntryID;
			double HQty = (double)(listCa.退料数量 == 0 ? 0 : listCa.退料数量);
			long HDeptWHID = listCa.HSTOCKID == 0 ? 0 : listCa.HSTOCKID;
			string HTuiResult = listCa.退料原因 == "" ? "" : listCa.退料原因;
			var HBillNo = DBUtility.ClsPub.CreateBillCode_Prod("6666", ref DBUtility.ClsPub.sExeReturnInfo, true);//获得一个新的单据号
			var HBillInterID = DBUtility.ClsPub.CreateBillID_Prod("6666", ref DBUtility.ClsPub.sExeReturnInfo);
			Int64 lngBillKey = listCa.HSouceInterID == 0 ? 0 : listCa.HSouceInterID;
			Int64 lngBillKeyEntry = listCa.HSourceEntryID == 0 ? 0 : listCa.HSourceEntryID;
			double HQty = (double)(listCa.退料数量 == 0 ? 0 : listCa.退料数量);
			long HDeptWHID = listCa.HSTOCKID == 0 ? 0 : listCa.HSTOCKID;
			string HTuiResult = listCa.退料原因 == "" ? "" : listCa.退料原因;
			var HBillNo = DBUtility.ClsPub.CreateBillCode_Prod("6666", ref DBUtility.ClsPub.sExeReturnInfo, true);//获得一个新的单据号
			var HBillInterID = DBUtility.ClsPub.CreateBillID_Prod("6666", ref DBUtility.ClsPub.sExeReturnInfo);

			oCN.BeginTran();
			//插入子表
			@@ -465,12 +496,12 @@
			var _value = msg["msg"].ToString();
			string[] sArray = _value.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string user = sArray[1].ToString();
			DBUtility.ClsPub.CurUserName = sArray[1].ToString();
			string HOrgID = sArray[2].ToString();

			try
			{
			if (!DBUtility.ClsPub.Security_Log("JIT_YL_ComplementGoods_Edit", 1, false, user))
			if (!DBUtility.ClsPub.Security_Log("JIT_YL_ComplementGoods_Edit", 1, false, DBUtility.ClsPub.CurUserName))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -491,6 +522,27 @@
			{
			if (listCa[i].退料数量 > 0)
			{
			if (listCa[i].退料数量 > listCa[i].已配送数量)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "退料数量大于已配送数量!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			ds = oCN.RunProcReturn("select sum(HQty) from JIT_CallGoodsBackRequestBillSub " +
			$"where HSourceInterID={listCa[i].HSouceInterID} and HSourceEntryID ={listCa[i].HSourceEntryID} and HSourceBillNo = '{listCa[i].HSourceBillNo}' and HMaterID={listCa[i].HMaterialID}", "JIT_CallGoodsBackRequestBillSub");

			if ((double.Parse(ds.Tables[0].Rows[0][0].ToString() == "" ? "0" : ds.Tables[0].Rows[0][0].ToString()) + listCa[i].退料数量) > listCa[i].已叫料数量)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = $"已经退料申请数量:{double.Parse(ds.Tables[0].Rows[0][0].ToString())},可退料数量为:{(listCa[i].已叫料数量 - double.Parse(ds.Tables[0].Rows[0][0].ToString()))}!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			flag = AddICStockTuiBill(listCa[i], "666602", " 余量退料", HOrgID, ref DBUtility.ClsPub.sExeReturnInfo);
			j = 1;
			}
			@@ -541,12 +593,12 @@
			var _value = msg["msg"].ToString();
			string[] sArray = _value.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string user = sArray[1].ToString();
			DBUtility.ClsPub.CurUserName = sArray[1].ToString();
			string HOrgID = sArray[2].ToString();

			try
			{
			if (!DBUtility.ClsPub.Security_Log("JIT_BF_ComplementGoods_Edit", 1, false, user))
			if (!DBUtility.ClsPub.Security_Log("JIT_BF_ComplementGoods_Edit", 1, false, DBUtility.ClsPub.CurUserName))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -567,6 +619,27 @@
			{
			if (listCa[i].退料数量 > 0)
			{
			if (listCa[i].退料数量 > listCa[i].已配送数量)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "退料数量大于已配送数量!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			ds = oCN.RunProcReturn("select sum(HQty) from JIT_CallGoodsBackRequestBillSub " +
			$"where HSourceInterID={listCa[i].HSouceInterID} and HSourceEntryID ={listCa[i].HSourceEntryID} and HSourceBillNo = '{listCa[i].HSourceBillNo}' and HMaterID={listCa[i].HMaterialID}", "JIT_CallGoodsBackRequestBillSub");

			if ((double.Parse(ds.Tables[0].Rows[0][0].ToString() == "" ? "0" : ds.Tables[0].Rows[0][0].ToString()) + listCa[i].退料数量) > listCa[i].已叫料数量)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = $"已经退料申请数量:{double.Parse(ds.Tables[0].Rows[0][0].ToString())},可退料数量为:{(listCa[i].已叫料数量 - double.Parse(ds.Tables[0].Rows[0][0].ToString()))}!";
			objJsonResult.data = null;
			return objJsonResult;
			}

			flag = AddICStockTuiBill(listCa[i], "666603", "报废退料", HOrgID, ref DBUtility.ClsPub.sExeReturnInfo);
			j = 1;
			}
			@@ -608,7 +681,7 @@
			}
			#endregion

			#region 生产叫料平台叫料拣料信息查询
			#region 生产叫料平台叫料拣料信息查询上查/下查
			//查询条件
			public class HlpBill
			{
			@@ -777,7 +850,7 @@
			msg2 = msg2.Replace("\\", "");
			msg2 = msg2.Replace("\n", "");

			ds = oCN.RunProcReturn("select * from JIT_CallGoodsBackBillMain ", "JIT_CallGoodsBackBillMain ");
			ds = oCN.RunProcReturn("select * from JIT_CallGoodsBackRequestBillMain where HISCheck=0 ", "JIT_CallGoodsBackRequestBillMain ");

			if (ds.Tables[0].Rows.Count > 0)
			{