~yxj/MES-WEB-API.git

			@@ -176,14 +176,6 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			//if (HEmpID == 0)
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "操作员没有选择！";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			//if (HQCCheckID == 0)
			//{
			// objJsonResult.code = "0";
			@@ -192,14 +184,42 @@
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			if (HSourceID == 0)

			//获取系统参数
			string Ret = "";
			if (oSystemParameter.ShowBill(ref Ret))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "生产资源没有选择！";
			objJsonResult.data = null;
			return objJsonResult;
			//判断客户不为龙山汽配
			if (oSystemParameter.omodel.WMS_CampanyName != "龙山汽配") //系统参数
			{
			if (HSourceID == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "生产资源没有选择！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			//判断客户为龙山汽配
			else if (oSystemParameter.omodel.WMS_CampanyName == "龙山汽配")
			{
			//判断是否为多工位
			ds = oCN.RunProcReturn("select * from h_v_GetStationOutBill_Detail where 工序ID = " + HProcID + " and 物料ID = " + HMaterID + " and 流转卡号 = '" + HProcExchBillNo + "'", "h_v_GetStationOutBill_Detail");
			if (ds != null && ds.Tables[0].Rows.Count <= 1)
			{
			if (HEmpID == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "操作员没有选择！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}
			}

			//if (HCenterID == 0)
			//{
			// objJsonResult.code = "0";
			@@ -447,6 +467,264 @@
			return objJsonResult;
			}
			}

			#region 批量新增单据-保存按钮
			[Route("Cj_StationOutBill/BatchAddBill")]
			[HttpPost]
			public object BatchAddBill([FromBody] JObject oMain)
			{
			var _value = oMain["oMain"].ToString();
			string msg1 = _value.ToString();
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			try
			{
			//反序列化
			string msg2 = "[" + sArray[0].ToString() + "]"; //表头
			string user = sArray[1].ToString();//用户名
			string msg3 = sArray[2].ToString(); //表体
			Int64 OperationType = Convert.ToInt64(sArray[3]); //操作类型

			//判断是否有编辑权限
			if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Edit", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无编辑权限!";
			objJsonResult.data = null;
			return objJsonResult;
			}


			List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(msg2);
			List<StationBill> listSub = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(msg3);

			oCN.BeginTran();
			for (int i = 0;i < listSub.Count; i++)
			{
			long HMainInterID = 0;
			HMainInterID = list[0].HMainInterID;
			string eventType = list[0].eventType;
			string BillType = "3791";
			string HBillSubType = "3791";
			long HInterID = listSub[i].HInterID;//递入type得到的单据ID
			string HBillNo = listSub[i].HBillNo;//递入type得到的单据号
			int HBillStatus = 0;
			string HMaker = user;//制单人
			string HMouldNum = list[0].HMouldNum;//模穴号
			int HYear = DateTime.Now.Year;
			double HPeriod = DateTime.Now.Month;
			string HRemark = list[0].HRemark;//备注
			string HSourceName = listSub[i].HSourceName;//生产资源名称
			double HPieceQty = list[0].HPieceQty;//进站PCS数
			double HWasterQty = listSub[i].HWasterQty;//报废数量
			double HPlanPieceQty = list[0].HPlanPieceQty;//进站PNL数
			double HBadPNL = list[0].HBadPNL;//报废PNL数
			long HICMOInterID = listSub[i].HICMOInterID;//任务单ID
			string HICMOBillNo = listSub[i].HICMOBillNo;//任务单
			int HProcPlanInterID = 0;
			int HProcPlanEntryID = 0;
			string HProcPlanBillNo = "";
			long HProcExchInterID = listSub[i].lngBillKey;
			long HProcExchEntryID = listSub[i].lngBillSubKey;
			string HProcExchBillNo = listSub[i].HProcExchBillNo;//流转卡
			long HMaterID = listSub[i].HMaterID;//产品ID
			long HProcID = listSub[i].HProcID;//当前工序ID
			double HICMOQty = listSub[i].HICMOQty;//任务单数量
			double HPlanQty = list[0].HPlanQty;//移交PNL数
			DateTime HStationOutTime = list[0].HStationOutTime;//汇报时间
			long HSourceID = listSub[i].HSourceID;//生产资源ID
			long HPayProcID = list[0].HPayProcID;//核算工序ID
			long HGroupID = list[0].HGroupID;//班组ID
			long HDeptID = 0;
			long HEmpID = listSub[i].HEmpID;//操作员ID
			string HBarCode = list[0].HBarCode;//条形码
			string HAddr = "";
			string HBarCodeMaker = "";
			long HSourceID2 = list[0].HSourceID2;//生产资源2ID
			long HSourceID3 = list[0].HSourceID3;//生产资源3ID
			long HSourceID4 = list[0].HSourceID4;//生产资源4ID
			long HSourceID5 = list[0].HSourceID5;//生产资源5ID
			long HSupID = 0;
			double HQty = listSub[i].HQty;//合格数量
			double HPrice = 0;
			double HMoney = 0;
			double HBadCount = list[0].HBadCount;//不良数量
			long HCenterID = listSub[0].HCenterID;//工作中心ID
			string HProcNo = listSub[i].HProcNo;//流水号
			string HOrderProcNO = list[0].HOrderProcNO;//订单跟踪号
			string HSourceNameList = list[0].HSourceNameList;//设备清单
			long HMainSourceInterID = list[0].HInterID;//递入type得到的单据ID
			string HMainSourceBillNo = list[0].HBillNo;//递入type得到的单据号
			string HMainSourceBillType = "3790";
			bool HLastSubProc = list[0].HLastSubProc;//转下工序
			long HEmpID2 = list[0].HEmpID2;//操作员2ID
			long HEmpID3 = list[0].HEmpID3;//操作员3ID
			long HEmpID4 = list[0].HEmpID4;//操作员4ID
			long HEmpID5 = list[0].HEmpID5;//操作员5ID
			double HDSQty = list[0].HDSQty;//折弯刀数
			double HChongQty = list[0].HChongQty;//NCT冲次数
			double HPriceRate = list[0].HPriceRate;//系数
			double HWorkTimes = list[0].HWorkTimes;//工时
			long HQCCheckID = list[0].HQCCheckID;//检验员ID
			long HPRDOrgID = list[0].HPRDOrgID;//组织ID

			var num = 0;

			//若MAINDI重复则重新获取
			if (OperationType == 1)//新增
			{
			num = 1;
			if (!AllowbillNo(HBillNo))
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据号重复！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			oCN.RunProc("Insert Into Sc_StationOutBillMain " +
			"(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate,HMouldNum" +
			",HYear,HPeriod,HRemark,HSourceName,HPieceQty,HWasterQty,HPlanPieceQty,HBadPNL" +
			",HICMOInterID,HICMOBillNo,HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HProcExchInterID,HProcExchEntryID" +
			",HProcExchBillNo,HMaterID,HProcID,HICMOQty,HPlanQty,HStationOutTime,HSourceID,HPayProcID" +
			",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,HPRDOrgID" +
			") " +
			" values('" + BillType + "','" + HBillSubType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate(),'" + HMouldNum + "'" +
			"," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HSourceName + "'," + HPieceQty + "," + HWasterQty + "," + HPlanPieceQty + "," + HBadPNL +
			"," + HICMOInterID + ",'" + HICMOBillNo + "'," + HProcPlanInterID + "," + HProcPlanEntryID + ",'" + HProcPlanBillNo + "'," + HProcExchInterID + "," + HProcExchEntryID +
			",'" + HProcExchBillNo + "'," + HMaterID + "," + HProcID + "," + HICMOQty + "," + HPlanQty + ",getdate()," + HSourceID + "," + HPayProcID +
			"," + 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 + "," + HPRDOrgID +
			") ");
			}
			else
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "操作类型无效！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//主表

			ds = oCN.RunProcReturn("exec h_p_MES_StationOutBill_QtyCtrl " + HInterID + "", "h_p_MES_StationOutBill_QtyCtrl");
			if (ds == null)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "判断数量失败！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ds.Tables[0].Rows.Count == 0)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "判断数量失败！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2")
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "数量控制," + ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
			objJsonResult.data = null;
			return objJsonResult;
			}
			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 + " ");
			//判断是否是末道工序
			ds1 = oCN.RunProcReturn(" select HLastProc,HFstProc from Sc_ProcessExchangeBillMain a " +
			" inner join Sc_ProcessExchangeBillSub b on a.HInterID=b.HInterID " +
			" Where a.HInterID=" + HProcExchInterID + " and b.HEntryID=" + HProcExchEntryID + " ", "Sc_ProcessExchangeBillMain");
			//判断是否是新增
			if (OperationType == 1)
			{
			//判断是否是末道工序
			if (ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HLastProc"]) == "是")
			{
			//获取系统参数
			string Return = "";
			if (oSystemParameter.ShowBill(ref Return))
			{
			//判断末道生产汇报汇报是否勾选
			if (oSystemParameter.omodel.MES_StationOutBill_LastAutoICMOReport == "Y") //系统参数
			{
			//同步生产汇报单
			objJsonResult = (json)SaveICMOReportBill(HInterID.ToString(), user, HBillNo, HPRDOrgID.ToString());
			if (objJsonResult.count == 0)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = objJsonResult.Message;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			//判断末道生产入库是否勾选
			else if (oSystemParameter.omodel.MES_StationOutBill_AutoStockIn == "Y") //系统参数
			{
			//同步生产入库单
			objJsonResult = (json)SaveProcdutInBill(HBillNo);
			if (objJsonResult.count == 0)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = objJsonResult.Message;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			}
			}
			}
			}

			oCN.Commit();
			string sReturn = "";
			if (oSystemParameter.ShowBill(ref sReturn) == true)
			{
			if (oSystemParameter.omodel.MES_StationOutBill_SaveAutoAddnew == "Y") //系统参数自动审核
			{
			objJsonResult.Verify = "Y";
			}
			else
			{
			objJsonResult.Verify = "N";
			}
			}
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "新增单据成功！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			catch (Exception e)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion

			#region 末道工序生产汇报
			public object SaveICMOReportBill(string InterID, string user, string BillNo, string OrganizationID)
			@@ -1184,9 +1462,34 @@
			return objJsonResult;
			}

			//获取系统参数
			string Ret = "";
			if (oSystemParameter.ShowBill(ref Ret))
			{
			//判断客户为龙山汽配
			if (oSystemParameter.omodel.WMS_CampanyName == "龙山汽配")
			{
			//获取需要拼接的字符串
			string sql_splice = DBUtility.ClsPub.SpliceSQL(user, "工序汇报单列表");

			if (sql_splice == "没有查询到相关用户信息")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有查询到相关用户信息!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			sWhere += sql_splice;
			}
			}
			}

			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from h_v_MES_StationOutBillList order by hmainid desc", "h_v_MES_StationOutBillList");
			ds = oCN.RunProcReturn("select * from h_v_MES_StationOutBillList where 1 = 1" + sWhere + "order by hmainid desc", "h_v_MES_StationOutBillList");
			}
			else
			{