MES-WEB-API.git

			@@ -149,6 +149,7 @@
			double HToCheckQty = list[0].HToCheckQty;//取样数量
			double HLossQty = list[0].HLossQty;//遗失数量
			double HBackWorkByMaterQty = list[0].HBackWorkByMaterQty;//遗失数量
			int HMouldID = list[0].HMouldID;//模具id

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

			@@ -391,7 +392,7 @@
			",HMainSourceInterID,HMainSourceBillNo,HMainSourceBillType,HLastSubProc" +
			",HEmpID2,HEmpID3,HEmpID4,HEmpID5,HDSQty,HChongQty,HPriceRate,HWorkTimes,HQCCheckID,HMainInterID,HPRDOrgID" +
			",HmaterOutqty,HProcPriceRate,HTemporaryAreaID,HWasterQty_Work,HWasterQty_Mater,HBackWorkQty,HShiftsID" +
			",HToCheckQty,HLossQty,HBackWorkByMaterQty" +
			",HToCheckQty,HLossQty,HBackWorkByMaterQty,HMouldID" +
			") " +
			" values('" + BillType + "','" + (OperationType == "5" ? "SUB" : HBillSubType) + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate(),'" + HMouldNum + "'" +
			"," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HSourceName + "'," + HPieceQty + "," + HWasterQty + "," + HPlanPieceQty + "," + HBadPNL +
			@@ -402,7 +403,7 @@
			"," + HMainSourceInterID + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'," + Convert.ToString(HLastSubProc ? 1 : 0) +
			"," + HEmpID2 + "," + HEmpID3 + "," + HEmpID4 + "," + HEmpID5 + "," + HDSQty + "," + HChongQty + "," + HPriceRate + "," + HWorkTimes + "," + HQCCheckID + "," + HMainInterID + "," + HPRDOrgID +
			"," + HmaterOutqty + "," + HProcPriceRate + "," + HTemporaryAreaID + "," + HWasterQty_Work + "," + HWasterQty_Mater + "," + HBackWorkQty +
			"," + HShiftsID + "," + HToCheckQty + "," + HLossQty + ","+ HBackWorkByMaterQty + ") ");
			"," + HShiftsID + "," + HToCheckQty + "," + HLossQty + ","+ HBackWorkByMaterQty + "," + HMouldID + ") ");

			LogService.Write($"4.新增结束，用时" + sw.Elapsed);
			LogService.Write("用户:" + user + ",日期:" + DateTime.Now + ",新增工序出站单据:" + HBillNo);
			@@ -447,6 +448,7 @@
			",HBackWorkQty=" + HBackWorkQty +
			",HShiftsID=" + HShiftsID +
			",HBackWorkByMaterQty=" + HBackWorkByMaterQty +
			",HMouldID=" + HMouldID +
			" where HInterID=" + HInterID);

			LogService.Write("用户:" + user + ",日期:" + DateTime.Now + ",修改工序出站单据:" + HBillNo);
			@@ -3673,5 +3675,48 @@
			}
			}
			#endregion

			#region 当前工单(扫码汇报) 找出当前工单使用模具
			[Route("Cj_StationOutBill_CurrentWork/getHModelList")]
			[HttpGet]
			public object getHModelList(string HInterID, string HEntryID,string HBillNo)
			{
			try
			{
			string sql = @"SELECT b.HMouldID,c.HMouldNo 模具编码,c.HName 模具名称,c.HModel 模具型号 FROM Sc_ICMOBillStatus_Tmp a LEFT JOIN(
			SELECT *, ROW_NUMBER() OVER(PARTITION BY HSourceID ORDER BY HScanDate DESC) AS RowNum FROM Sc_MouldUpperBillSub
			) b ON a.HSourceID = b.HSourceID AND b.RowNum = 1 left join Gy_MouldFileMain c on b.HMouldID = c.HInterID
			where b.HMouldID is not null and a.HSourceInterID ='" + HInterID + "' and a.HSourceEntryID ='" + HEntryID + "' and a.HSourceBillNo ='" + HBillNo + "'";
			ds = oCN.RunProcReturn(sql, "Sc_ICMOBillStatus_Tmp");

			if (ds.Tables[0].Rows.Count != 0 && ds != null)
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "";
			return objJsonResult;
			}


			}
			catch (Exception e)
			{

			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion
			}
			}