~yxj/MES-WEB-API.git

			@@ -104,6 +104,9 @@
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			string msg3 = sArray[1].ToString();

			int hentryid = int.Parse(sArray[2].ToString());//子表的顺序id
			int OperationType = int.Parse(sArray[3].ToString());//数据类型 1添加 3修改
			try
			{
			msg2 = "[" + msg2.ToString() + "]";
			@@ -112,7 +115,7 @@
			long HInterID = mainList[0].HInterID;//递入type得到的单据ID
			string HBillNo = mainList[0].HBillNo;//递入type得到的单据号
			DateTime HDate = mainList[0].HDate;//日期
			int HYear = 2021;
			int HYear = DateTime.Now.Year;
			double HPeriod = 1;
			string HRemark = mainList[0].HRemark;//备注
			string HMaker = mainList[0].HMaker;//制单人
			@@ -134,24 +137,48 @@
			double HStdSourceQty = mainList[0].HStdSourceQty;//标准资源数
			double HAddSourceRate = mainList[0].HAddSourceRate;//加资源增量
			double HDelSourceRate = mainList[0].HDelSourceRate;//减资源减量
			int HPRDORGID = mainList[0].HPRDORGID; //组织

			//主表
			oCN.RunProc("Insert Into Gy_RoutingBillMain " +
			"(HBillType,HInterID,HBillNo,HDate" +
			",HYear,HPeriod,HRemark,HMaker,Hmakedate,HMaterID,HName,HMaterTypeID" +
			",HRoutingGroupID,HUnitID,HMaterNumber,HUnitNumber,HStandard" +
			",HMainGroupID,HMainProcID,HMainCenterID,HMainTimeUnit,HMainUnitTime,HMainWorkQty" +
			",HMainPrice,HStdSourceQty,HAddSourceRate,HDelSourceRate" +
			") " +
			" values('" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
			"," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()," + HMaterID + ",'" + HName + "'," + HMaterTypeID +
			"," + HRoutingGroupID + "," + HUnitID + ",'" + HMaterNumber + "','" + HUnitNumber + "'," + Convert.ToString(HStandard ? 1 : 0) +
			"," + HMainGroupID + "," + HMainProcID + "," + HMainCenterID + ",'" + HMainTimeUnit + "'," + HMainUnitTime + "," + HMainWorkQty +
			"," + HMainPrice + "," + HStdSourceQty + "," + HAddSourceRate + "," + HDelSourceRate +
			") ");
			string HPicNumVer = mainList[0].HPicNumVer;//图号版本
			string HPicNumAssemble = mainList[0].HPicNumAssemble;//总装图号
			string HMaterTexture = mainList[0].HMaterTexture;//材质
			string HProductNum = mainList[0].HProductNum;//成品编号
			string HVerNum = mainList[0].HVerNum;//版本

			if (OperationType == 1)//新增
			{
			//主表
			oCN.RunProc("Insert Into Gy_RoutingBillMain " +
			"(HBillType,HInterID,HBillNo,HDate" +
			",HYear,HPeriod,HRemark,HMaker,Hmakedate,HMaterID,HName,HMaterTypeID" +
			",HRoutingGroupID,HUnitID,HMaterNumber,HUnitNumber,HStandard" +
			",HMainGroupID,HMainProcID,HMainCenterID,HMainTimeUnit,HMainUnitTime,HMainWorkQty" +
			",HMainPrice,HStdSourceQty,HAddSourceRate,HPRDORGID,HDelSourceRate" +
			",HPicNumVer,HPicNumAssemble,HMaterTexture,HProductNum,HVerNum) " + " values('" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
			"," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()," + HMaterID + ",'" + HName + "'," + HMaterTypeID +
			"," + HRoutingGroupID + "," + HUnitID + ",'" + HMaterNumber + "','" + HUnitNumber + "'," + Convert.ToString(HStandard ? 1 : 0) +
			"," + HMainGroupID + "," + HMainProcID + "," + HMainCenterID + ",'" + HMainTimeUnit + "'," + HMainUnitTime + "," + HMainWorkQty +
			"," + HMainPrice + "," + HStdSourceQty + "," + HAddSourceRate + "," + HPRDORGID + "," + HDelSourceRate +
			",'"+ HPicNumVer + "','" + HPicNumAssemble + "','" + HMaterTexture + "','" + HProductNum + "','" + HVerNum + "') ");
			}
			else if (OperationType == 3)
			{ //修改
			oCN.RunProc("update Gy_RoutingBillMain set " +
			"HDate='" + HDate +
			"',HYear='" + HYear + "',HPeriod='" + HPeriod + "',HRemark='" + HRemark + "',HMaker='" + HMaker +
			"',Hmakedate=getdate(),HMaterID='" + HMaterID + "',HName='" + HName + "',HMaterTypeID='" + HMaterTypeID +
			"',HRoutingGroupID='" + HRoutingGroupID + "',HUnitID='" + HUnitID + "',HMaterNumber='" + HMaterNumber + "',HUnitNumber='" + HUnitNumber +
			"',HStandard='" + Convert.ToString(HStandard ? 1 : 0) + "',HMainGroupID='" + HMainGroupID + "',HMainProcID='" + HMainProcID + "',HMainCenterID='" + HMainCenterID +
			"',HMainTimeUnit='" + HMainTimeUnit + "',HMainUnitTime='" + HMainUnitTime + "',HMainWorkQty='" + HMainWorkQty + "',HMainPrice='" + HMainPrice +
			"',HStdSourceQty='" + HStdSourceQty + "',HAddSourceRate='" + HAddSourceRate + "',HDelSourceRate='" + HDelSourceRate +
			"',HPicNumVer='" + HPicNumVer + "',HPicNumAssemble='" + HPicNumAssemble + "',HMaterTexture='" + HMaterTexture + "'" +
			",HProductNum='" + HProductNum + "',HVerNum='" + HVerNum + "' where HInterID='" + HInterID + "'");

			//删除子表
			oCN.RunProc("delete from Gy_RoutingBillSub where HInterID='" + HInterID + "' and HEntryID='" + hentryid + "'");
			}
			//保存子表
			objJsonResult = AddBillSub(msg3, HInterID);
			objJsonResult = AddBillSub(msg3, HInterID, hentryid);
			if (objJsonResult.code == "0")
			{
			objJsonResult.code = "0";
			@@ -163,23 +190,28 @@
			oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID); //设置默认工艺路线
			//判断是否重复工序号
			ds = oCN.RunProcReturn("exec h_p_Gy_RoutingCtrl " + HInterID, "h_p_Gy_RoutingCtrl");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)

			if (OperationType == 1)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "判断重复工序号失败！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			if (ClsPub.isStrNull(ds.Tables[0].Rows[0][0]) == "2")

			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = ClsPub.isStrNull(ds.Tables[0].Rows[0][1]);
			objJsonResult.Message = "判断重复工序号失败！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			if (ClsPub.isStrNull(ds.Tables[0].Rows[0][0]) == "2")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = ClsPub.isStrNull(ds.Tables[0].Rows[0][1]);
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}
			objJsonResult.code = "1";
			@@ -198,11 +230,14 @@
			}
			}

			public json AddBillSub(string msg3,long HInterID) {
			List<Gy_RoutingBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_RoutingBillSub>>(msg3);
			for (int i=0;i< subList.ToArray().Length;i++)
			public json AddBillSub(string msg3, long HInterID, int hentryid)
			{
			List<Gy_RoutingBillSub> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_RoutingBillSub>>(msg3);
			int i = 0;
			foreach (Gy_RoutingBillSub oSub in DetailColl)
			{
			if (subList[i].HWorkQty <= 0)
			i++;
			if (oSub.HWorkQty <= 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -210,72 +245,34 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			long HCenterID = 0;//工作中心ID
			string HTimeUnit = "";//时间单位
			double HUnitTime = 0;//运行时间
			double HReadyTime = 0;//准备时间
			double HQueueTime = 0;//排队时间
			double HMoveTime = 0;//转移时间
			string HCloseMan = "";//关闭人
			bool HCloseType = false;//
			string HProcType = "";//工序类型
			bool HNextProcFlag = false;//下道流转工序
			bool HFlowProc = false;//流转工序
			double HFixPrice = 0;//班产定额
			double HProcPrice = 0;//工序工价
			double HBadPrice = 0;//不合格单价
			double HWasterPrice = 0;//报废单价
			bool HStdFlag = false;//标准定额
			double HBeginDayQty = 0;//开工余量（天数）
			double HBeginFixQty = 0;//开工余量（固数）
			long HSourceInterID = 0;//源单主内码
			long HSourceEntryID = 0;//源单子内码
			string HSourceBillNo = "";//源单单号
			string HSourceBillType = "";//源单类型
			double HRelationQty = 0;//关联数量
			double HRelationMoney = 0;//关联金额
			bool HAutoTrunFlag = false;//自动移转
			double HFixWorkDays = 0;//上道固定天数
			double HTrunWorkDays = 0;//上道循环周期
			double HReadyTimes = 0;//本道准备时间
			double HICMOReadyTimes = 0;//换单准备时间
			double HSubStdEmpQty = 0;//标准人数
			double HSubCanUseSourceQty = 0;//可操作设备数
			long HProcID_S = 0;//工段ID
			long HCenterID_S = 0;//产线中心ID
			double HWorkQty_S = 0;//产线产能
			double HSubStdEmpQty_S = 0;//产线人数
			string HMouldNo = "";//模具编号
			double HChangeMould = 0;//换模时间/换刀时间
			string HPackStd = "";//周转箱标准
			string HPack = "";//周转箱
			string HPutArea = "";//暂放区
			double HMyWorkDays = 0;//生产周期
			double HMyFixWorkDays = 0;//固定生产天数

			oCN.RunProc("Insert into Gy_RoutingBillSub " +
			"(HInterID,HEntryID,HProcID,HProcNO,HSupID,HSupFlag" +
			",HWorkQty,HCenterID,HTimeUnit,HUnitTime" +
			",HReadyTime,HQueueTime,HMoveTime" +
			",HCloseMan,HCloseType,HRemark,HProcType,HNextProcFlag,HFlowProc" +
			",HFixPrice,HProcPrice,HBadPrice,HWasterPrice,HStdFlag,HBeginDayQty,HBeginFixQty" +
			",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HAutoTrunFlag" +
			",HFixWorkDays,HTrunWorkDays,HReadyTimes,HICMOReadyTimes,HSubStdEmpQty,HSubCanUseSourceQty" +
			",HProcID_S,HCenterID_S,HWorkQty_S,HSubStdEmpQty_S,HMouldNo,HChangeMould" +
			",HPackStd,HPack,HPutArea,HMyWorkDays,HMyFixWorkDays,HPassRate" +
			") values("
			+ HInterID + "," + i + "," + subList[i].HProcID + "," + subList[i].HProcNo + "," + subList[i].HSupID + "," + Convert.ToString(subList[i].HSupFlag ? 1 : 0) + "" +
			"," + subList[i].HWorkQty + "," + HCenterID + ",'" + HTimeUnit + "'," + HUnitTime +
			"," + HReadyTime + "," + HQueueTime + "," + HMoveTime +
			",'" + HCloseMan + "'," + Convert.ToString(HCloseType ? 1 : 0) + ",'" + subList[i].HRemark + "','" + HProcType + "'," + Convert.ToString(HNextProcFlag ? 1 : 0) + "," + Convert.ToString(HFlowProc ? 1 : 0) +
			"," + HFixPrice + "," + HProcPrice + "," + HBadPrice + "," + HWasterPrice + "," + Convert.ToString(HStdFlag ? 1 : 0) + "," + HBeginDayQty + "," + HBeginFixQty +
			"," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "'," + HRelationQty + "," + HRelationMoney + "," + Convert.ToString(HAutoTrunFlag ? 1 : 0) +
			"," + HFixWorkDays + "," + HTrunWorkDays + "," + HReadyTimes + "," + HICMOReadyTimes + "," + HSubStdEmpQty + "," + HSubCanUseSourceQty +
			"," + HProcID_S + "," + HCenterID_S + "," + HWorkQty_S + ", " + HSubStdEmpQty_S + ",'" + HMouldNo + "'," + HChangeMould +
			",'" + HPackStd + "','" + HPack + "','" + HPutArea + "'," + HMyWorkDays + "," + HMyFixWorkDays + "," + subList[i].HPassRate +
			") ");
			"(HInterID,HEntryID,HProcID,HProcNO,HSupID,HSupFlag" +
			",HWorkQty,HCenterID,HTimeUnit,HUnitTime" +
			",HReadyTime,HQueueTime,HMoveTime" +
			",HCloseMan,HCloseType,HRemark,HProcType,HNextProcFlag,HFlowProc" +
			",HFixPrice,HProcPrice,HBadPrice,HWasterPrice,HStdFlag,HBeginDayQty,HBeginFixQty" +
			",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HAutoTrunFlag" +
			",HFixWorkDays,HTrunWorkDays,HReadyTimes,HICMOReadyTimes,HSubStdEmpQty,HSubCanUseSourceQty" +
			",HProcID_S,HCenterID_S,HWorkQty_S,HSubStdEmpQty_S,HMouldNo,HChangeMould" +
			",HPackStd,HPack,HPutArea,HMyWorkDays,HMyFixWorkDays,HPassRate" +
			",HTechnologyParameter,HPicNum,HProcCheckNote" +
			",HOverRate,HProcWorkNum" +
			") values("
			+ HInterID + "," + (hentryid==-1?i: hentryid) + "," + oSub.HProcID.ToString() + ",'" + (hentryid == -1 ? i : hentryid) + "'," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "" +
			"," + oSub.HWorkQty.ToString() + "," + oSub.HCenterID.ToString() + ",'" + oSub.HTimeUnit.ToString() + "'," + oSub.HUnitTime.ToString() +
			"," + oSub.HReadyTime.ToString() + "," + oSub.HQueueTime.ToString() + "," + oSub.HMoveTime.ToString() +
			",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "','" + oSub.HProcType + "'," + Convert.ToString(oSub.HNextProcFlag ? 1 : 0) + "," + Convert.ToString(oSub.HFlowProc ? 1 : 0) +
			"," + oSub.HFixPrice.ToString() + "," + oSub.HProcPrice.ToString() + "," + oSub.HBadPrice.ToString() + "," + oSub.HWasterPrice.ToString() + "," + Convert.ToString(oSub.HStdFlag ? 1 : 0) + "," + oSub.HBeginDayQty.ToString() + "," + oSub.HBeginFixQty.ToString() +
			"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + "," + Convert.ToString(oSub.HAutoTrunFlag ? 1 : 0) +
			"," + oSub.HFixWorkDays.ToString() + "," + oSub.HTrunWorkDays.ToString() + "," + oSub.HReadyTimes.ToString() + "," + oSub.HICMOReadyTimes.ToString() + "," + oSub.HSubStdEmpQty.ToString() + "," + oSub.HSubCanUseSourceQty.ToString() +
			"," + oSub.HProcID_S.ToString() + "," + oSub.HCenterID_S.ToString() + "," + oSub.HWorkQty_S.ToString() + ", " + oSub.HSubStdEmpQty_S.ToString() + ",'" + oSub.HMouldNo + "'," + oSub.HChangeMould.ToString() +
			",'" + oSub.HPackStd + "','" + oSub.HPack + "','" + oSub.HPutArea + "'," + oSub.HMyWorkDays.ToString() + "," + oSub.HMyFixWorkDays.ToString() + "," + oSub.HPassRate.ToString() +
			",'" + oSub.HTechnologyParameter.ToString() + "','" + oSub.HPicNum.ToString() + "','" + oSub.HProcCheckNote.ToString() +
			"', " + oSub.HOverRate.ToString() + ",'" + oSub.HProcWorkNum.ToString() + "'" +
			") ");
			}


			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = null;