MES-WEB-API.git

			@@ -142,6 +142,10 @@
			double HmaterOutqty = list[0].HmaterOutqty;//白坯发布
			double HProcPriceRate = list[0].HProcPriceRate;//工价系数
			int HTemporaryAreaID = list[0].HTemporaryAreaID;//暂放区
			double HWasterQty_Work = list[0].HWasterQty_Work;//工废数量
			double HWasterQty_Mater = list[0].HWasterQty_Mater;//料废数量
			double HBackWorkQty = list[0].HBackWorkQty;//返工数量
			Int64 HShiftsID = list[0].HShiftsID;//生产班次

			LogService.Write($"1.字段赋值，用时" + sw.Elapsed );

			@@ -368,7 +372,7 @@
			",HSupID,HQty,HPrice,HMoney,HBadCount,HCenterID,HProcNo,HOrderProcNO,HSourceNameList" +
			",HMainSourceInterID,HMainSourceBillNo,HMainSourceBillType,HLastSubProc" +
			",HEmpID2,HEmpID3,HEmpID4,HEmpID5,HDSQty,HChongQty,HPriceRate,HWorkTimes,HQCCheckID,HMainInterID,HPRDOrgID" +
			",HmaterOutqty,HProcPriceRate,HTemporaryAreaID" +
			",HmaterOutqty,HProcPriceRate,HTemporaryAreaID,HWasterQty_Work,HWasterQty_Mater,HBackWorkQty,HShiftsID" +
			") " +
			" values('" + BillType + "','" + (OperationType == "5" ? "SUB" : HBillSubType) + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate(),'" + HMouldNum + "'" +
			"," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HSourceName + "'," + HPieceQty + "," + HWasterQty + "," + HPlanPieceQty + "," + HBadPNL +
			@@ -378,7 +382,8 @@
			"," + 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 + "," + HPRDOrgID +
			","+ HmaterOutqty + "," + HProcPriceRate + ","+ HTemporaryAreaID + ") ");
			","+ HmaterOutqty + "," + HProcPriceRate + ","+ HTemporaryAreaID + "," + HWasterQty_Work + "," + HWasterQty_Mater + "," + HBackWorkQty +
			"," + HShiftsID + ") ");

			LogService.Write($"4.新增结束，用时" + sw.Elapsed);
			LogService.Write("用户:" + user + ",日期:" + DateTime.Now + ",新增工序出站单据:" + HBillNo);
			@@ -415,6 +420,10 @@
			",HSourceNameList='" + HSourceNameList + "'" +
			",HWasterQty=" + HWasterQty +
			",HLastSubProc=" + Convert.ToString(HLastSubProc ? 1 : 0) +
			",HWasterQty_Work=" + HWasterQty_Work +
			",HWasterQty_Mater=" + HWasterQty_Mater +
			",HBackWorkQty=" + HBackWorkQty +
			",HShiftsID=" + HShiftsID +
			" where HInterID=" + HInterID);

			LogService.Write("用户:" + user + ",日期:" + DateTime.Now + ",修改工序出站单据:" + HBillNo);
			@@ -566,6 +575,7 @@
			}
			sw.Stop();//结束计时
			LogService.Write($"11.参数查询结束,新增结束，用时" + sw.Elapsed);
			LogService.Write("END--出站单据保存结束，出站单号：" + HBillNo);
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "新增单据成功！";
			@@ -574,6 +584,7 @@
			}
			catch (Exception e)
			{
			LogService.Write("出站单据保存发生异常，出站单号：" + sArray[0].ToString());
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -2347,7 +2358,17 @@

			oCn.BeginTran();

			oCn.RunProc("delete from Sc_StationOutBillSub_SN where HInterID="+ HInterID+ " and HBarCode='"+ HBardcode + "'");
			ds = oCn.RunProcReturn($"select * from Sc_AssemblyBillMain where HMainSourceInterID={oBill.omodel.HProcExchInterID} and HMainSourceEntryID={oBill.omodel.HProcExchEntryID} and HBarCode_P='{HBardcode}'", "Sc_AssemblyBillMain");

			if (ds.Tables[0].Rows.Count > 0)
			{
			oCn.RunProc($"delete from Sc_AssemblyBillMain where HMainSourceInterID={oBill.omodel.HProcExchInterID} and HMainSourceEntryID={oBill.omodel.HProcExchEntryID} and HBarCode_P='{HBardcode}'");
			oCn.RunProc($"delete from Sc_AssemblyBillMain where HInterID={ds.Tables[0].Rows[0]["HInterID"].ToString()} and HBarCode_P='{HBardcode}'");
			}

			oCn.RunProc("delete from Sc_StationOutBillSub_SN where HInterID=" + HInterID + " and HBarCode='" + HBardcode + "'");
			oCn.RunProc("update Sc_StationOutBillMain set HQty-=1 where HInterID=" + HInterID);


			oCn.Commit();

			@@ -3214,19 +3235,30 @@
			#region 当前工单(扫码汇报) 条码查询
			[Route("Cj_StationOutBill_CurrentWork/SNHBardCodeList")]
			[HttpGet]
			public object SNHBardCodeList(string HBarCode, string user, int HOrgID)
			public object SNHBardCodeList(string HBarCode, string HProcID, int HOrgID)
			{
			try
			{
			DataSet dataSet = null;
			var num = 0;
			ds = oCN.RunProcReturn(@"select HSourceInterID,HSourceBillNo from Gy_BarCodeBill WITH(NOLOCK) where HBarCode='" + HBarCode + "'", "Gy_BarCodeBill");

			if (ds.Tables[0].Rows.Count > 0)
			{
			string HSourceInterID = ds.Tables[0].Rows[0]["HSourceInterID"].ToString();
			string HSourceBillNo = ds.Tables[0].Rows[0]["HSourceBillNo"].ToString();
			num = 1;
			dataSet = ds;
			}

			ds = oCN.RunProcReturn("select * from gy_czygl WITH(NOLOCK) where czymc='" + user + "'", "gy_czygl");
			string HProcID = ds.Tables[0].Rows[0]["HProcID"].ToString();
			ds = oCN.RunProcReturn(@"select HInterID,HBillNo from Sc_ProcessExchangeBillMain WITH(NOLOCK) where HBillNo='" + HBarCode + "'", "Sc_ProcessExchangeBillMain");
			if (ds.Tables[0].Rows.Count > 0)
			{
			num = 2;
			dataSet = ds;
			}

			if (num == 1)
			{
			string HSourceInterID = dataSet.Tables[0].Rows[0]["HSourceInterID"].ToString();
			string HSourceBillNo = dataSet.Tables[0].Rows[0]["HSourceBillNo"].ToString();

			ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillList where hmainid=" + HSourceInterID + " and 单据号='" + HSourceBillNo + "' and HProcID=" + HProcID, "h_v_Sc_ProcessExchangeBillList");

			@@ -3243,7 +3275,30 @@
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			else {
			else if (num == 2)
			{
			string HSourceInterID = dataSet.Tables[0].Rows[0]["HInterID"].ToString();
			string HSourceBillNo = dataSet.Tables[0].Rows[0]["HBillNo"].ToString();

			ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillList where hmainid=" + HSourceInterID + " and 单据号='" + HSourceBillNo + "' and HProcID=" + HProcID, "h_v_Sc_ProcessExchangeBillList");

			if (ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "条码:" + HBarCode + ",流转卡:" + HSourceBillNo + ",与当前流转卡,所对应的工序不存在!";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "条码查无数据!";