~yxj/MES-WEB-API.git

			@@ -21,6 +21,130 @@
			DataSet ds1;


			///// <summary>
			///// test
			/////参数：string sql。
			/////返回值：object。
			///// </summary>
			//[Route("Cj_StationInBill/AddBill")]
			//[HttpPost]
			//public object AddBill([FromBody] JObject oMain)
			//{
			// var _value = oMain["oMain"].ToString();
			// string msg1 = _value.ToString();
			// try
			// {
			// //委外工序发出反序列化
			// msg1 = "[" + msg1.ToString() + "]";
			// List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(msg1);
			// string BillType = "3790";
			// long HInterID = list[0].HInterID;//递入type得到的单据ID
			// string HBillNo = list[0].HBillNo;//递入type得到的单据号
			// int HBillStatus = 0;
			// string HMaker = list[0].HMaker;//制单人
			// int HYear = 2021;
			// long HPeriod = 1;
			// string HRemark = list[0].HRemark;//备注
			// long HICMOInterID = list[0].HICMOInterID;//任务单ID
			// string HICMOBillNo = list[0].HICMOBillNo;//任务单
			// int HProcPlanInterID = 0;
			// int HProcPlanEntryID = 0;
			// string HProcPlanBillNo = "";
			// int HProcExchInterID = 0;
			// int HProcExchEntryID = 0;
			// string HProcExchBillNo = list[0].HProcExchBillNo;//流转卡
			// long HMaterID = list[0].HMaterID;//产品ID
			// long HProcID = list[0].HProcID;//当前工序
			// double HICMOQty = list[0].HICMOQty;//任务单数量
			// double HPlanQty = list[0].HPlanQty;//流转卡数量
			// long HSourceID = list[0].HSourceID;//生产资源ID
			// long HGroupID = list[0].HGroupID;//班组ID
			// long HDeptID = 0;
			// long HEmpID = list[0].HEmpID;//接收人ID
			// string HBarCode = list[0].HBarCode;//条形码
			// string HAddr = "";
			// string HBarCodeMaker = "";
			// long HSupID = 0;
			// double HQty = list[0].HQty;//接收数量
			// double HPrice = 0;
			// double HMoney = 0;
			// double HPieceQty = list[0].HPieceQty;//接收件数
			// string HSourceName = list[0].HSourceName;//生产资源名称
			// long HCenterID = list[0].HCenterID;//工作中心ID
			// long HProcNo = list[0].HProcNo;//流水号
			// string HOrderProcNO = list[0].HOrderProcNO;//订单跟踪号

			// ListModels oListModels = new ListModels();

			// DAL.ClsSc_StationInBill BillNew = new DAL.ClsSc_StationInBill();

			// BillNew.omodel.HInterID = HInterID;
			// BillNew.omodel.HYear = HYear;
			// BillNew.omodel.HPeriod = HPeriod;
			// BillNew.omodel.HBillNo = HBillNo;
			// BillNew.omodel.HICMOBillNo = HICMOBillNo;
			// BillNew.omodel.HICMOInterID = HICMOInterID;
			// BillNew.omodel.HProcExchInterID = HProcExchInterID;
			// BillNew.omodel.HProcExchEntryID = HProcExchEntryID;
			// BillNew.omodel.HProcExchBillNo = HProcExchBillNo;
			// BillNew.omodel.HProcID = HProcID;
			// BillNew.omodel.HMaterID = HMaterID;
			// BillNew.omodel.HStationInTime = DateTime.Now;
			// BillNew.omodel.HEmpID = HEmpID;
			// BillNew.omodel.HSourceID = HSourceID;
			// BillNew.omodel.HGroupID = HGroupID;
			// BillNew.omodel.HICMOQty = HICMOQty;
			// BillNew.omodel.HPlanQty = HPlanQty;
			// BillNew.omodel.HQty = HQty;
			// BillNew.omodel.HPieceQty = HPieceQty;
			// BillNew.omodel.HSourceName = HSourceName;
			// BillNew.omodel.HCenterID = HCenterID;
			// BillNew.omodel.HBillStatus = HBillStatus;
			// BillNew.omodel.HMaker = HMaker;
			// BillNew.omodel.HRemark = HRemark;
			// BillNew.omodel.HProcPlanInterID = HProcPlanInterID;
			// BillNew.omodel.HProcPlanEntryID = HProcPlanEntryID;
			// BillNew.omodel.HProcPlanBillNo = HProcPlanBillNo;
			// BillNew.omodel.HDeptID = HDeptID;
			// BillNew.omodel.HBarCode = HBarCode;
			// BillNew.omodel.HAddr = HAddr;
			// BillNew.omodel.HBarCodeMaker = HBarCodeMaker;
			// BillNew.omodel.HSupID = HSupID;
			// BillNew.omodel.HPrice = HPrice;
			// BillNew.omodel.HMoney = HMoney;

			// BillNew.omodel.HProcNo = HProcNo;
			// BillNew.omodel.HOrderProcNO = HOrderProcNO;
			// bool bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);

			// //提示
			// if (bResult == true)
			// {
			// objJsonResult.code = "1";
			// objJsonResult.count = 1;
			// objJsonResult.Message = "单据存盘完毕!单据号:" + HBillNo.Trim();
			// objJsonResult.data = null;
			// return objJsonResult;
			// }
			// else
			// {
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "保存失败!原因:" + ClsPub.sExeReturnInfo;
			// objJsonResult.data = null;
			// return objJsonResult;
			// }
			// }
			// catch (Exception e)
			// {
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "Exception！" + e.ToString();
			// objJsonResult.data = null;
			// return objJsonResult;
			// }
			//}


			/// <summary>
			/// 新增单据-保存按钮
			@@ -38,6 +162,43 @@
			//委外工序发出反序列化
			msg1 = "[" + msg1.ToString() + "]";
			List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(msg1);
			long HProcExchInterID = list[0].lngBillKey;//流转卡主内码
			if (HProcExchInterID <= 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "错误的流转卡内码！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			long HProcExchEntryID = list[0].lngBillSubKey;//流转卡子内码
			if (HProcExchEntryID <= 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "流水号没有选择！请输入流水号后回车！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			long HProcNo = list[0].HProcNo;//流水号
			if (HProcNo <= 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "流水号没有选择！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			string HProcExchBillNo = list[0].HProcExchBillNo;//流转卡
			if (HProcExchBillNo == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "流转卡号没有选择！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			string eventType = list[0].eventType;
			string BillType = "3790";
			long HInterID = list[0].HInterID;//递入type得到的单据ID
			string HBillNo = list[0].HBillNo;//递入type得到的单据号
			@@ -48,12 +209,9 @@
			string HRemark = list[0].HRemark;//备注
			long HICMOInterID = list[0].HICMOInterID;//任务单ID
			string HICMOBillNo = list[0].HICMOBillNo;//任务单
			int HProcPlanInterID = 0;
			int HProcPlanEntryID = 0;
			long HProcPlanInterID = 0;
			long HProcPlanEntryID = 0;
			string HProcPlanBillNo = "";
			int HProcExchInterID = 0;
			int HProcExchEntryID = 0;
			string HProcExchBillNo = list[0].HProcExchBillNo;//流转卡
			long HMaterID = list[0].HMaterID;//产品ID
			long HProcID = list[0].HProcID;//当前工序
			double HICMOQty = list[0].HICMOQty;//任务单数量
			@@ -72,28 +230,140 @@
			double HPieceQty = list[0].HPieceQty;//接收件数
			string HSourceName = list[0].HSourceName;//生产资源名称
			long HCenterID = list[0].HCenterID;//工作中心ID
			string HProcNo = list[0].HProcNo;//流水号
			string HOrderProcNO = list[0].HOrderProcNO;//订单跟踪号
			//单据完整性判断
			if (HMaterID <= 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "产品没有选择！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (HSourceID <= 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "工作中心没有选择！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (HProcID <= 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "当前工序没有选择！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (HQty <= 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "接收个数不能为0！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			ds = oCN.RunProcReturn("select HInterID from Sc_ProcessExchangeBillSub Where hinterid=" + HProcExchInterID + " and hprocno<" + HProcNo + " order by hprocno", "Sc_ProcessExchangeBillSub");
			if (ds == null)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "判断首道工序失败，不允许保存！";
			objJsonResult.data = null;
			return objJsonResult;
			}


			//若MAINDI重复则重新获取
			oCN.BeginTran();
			//主表
			oCN.RunProc("Insert Into Sc_StationInBillMain " +
			"(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
			",HYear,HPeriod,HRemark" +
			",HICMOInterID,HICMOBillNo,HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HProcExchInterID,HProcExchEntryID" +
			",HProcExchBillNo,HMaterID,HProcID,HICMOQty,HPlanQty,HStationInTime,HSourceID" +
			",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate" +
			",HSupID,HQty,HPrice,HMoney,HPieceQty,HSourceName,HCenterID" +
			",HProcNo,HOrderProcNO" +
			") " +
			" values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate()" +
			"," + HYear + "," + HPeriod + ",'" + HRemark + "'" +
			"," + HICMOInterID + ",'" + HICMOBillNo + "'," + HProcPlanInterID + "," + HProcPlanEntryID + ",'" + HProcPlanBillNo + "'," + HProcExchInterID + "," + HProcExchEntryID +
			",'" + HProcExchBillNo + "'," + HMaterID + "," + HProcID + "," + HICMOQty + "," + HPlanQty + ",getdate()," + HSourceID +
			"," + HGroupID + "," + HDeptID + "," + HEmpID + ",'" + HBarCode + "','" + HAddr + "','" + HBarCodeMaker + "',getdate()" +
			"," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HPieceQty + ",'" + HSourceName + "'," + HCenterID +
			",'" + HProcNo + "','" + HOrderProcNO + "'" +
			") ");

			if ("Add".Equals(eventType))
			{
			if (!AllowbillNo(HBillNo))
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据号重复！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//插入主表
			oCN.RunProc("Insert Into Sc_StationInBillMain " +
			"(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
			",HYear,HPeriod,HRemark" +
			",HICMOInterID,HICMOBillNo,HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HProcExchInterID,HProcExchEntryID" +
			",HProcExchBillNo,HMaterID,HProcID,HICMOQty,HPlanQty,HStationInTime,HSourceID" +
			",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate" +
			",HSupID,HQty,HPrice,HMoney,HPieceQty,HSourceName,HCenterID" +
			",HProcNo,HOrderProcNO" +
			") " +
			" values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate()" +
			"," + HYear + "," + HPeriod + ",'" + HRemark + "'" +
			"," + HICMOInterID + ",'" + HICMOBillNo + "'," + HProcPlanInterID + "," + HProcPlanEntryID + ",'" + HProcPlanBillNo + "'," + HProcExchInterID + "," + HProcExchEntryID +
			",'" + HProcExchBillNo + "'," + HMaterID + "," + HProcID + "," + HICMOQty + "," + HPlanQty + ",getdate()," + HSourceID +
			"," + HGroupID + "," + HDeptID + "," + HEmpID + ",'" + HBarCode + "','" + HAddr + "','" + HBarCodeMaker + "',getdate()" +
			"," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HPieceQty + ",'" + HSourceName + "'," + HCenterID +
			",'" + HProcNo + "','" + HOrderProcNO + "'" +
			") ");
			}
			else if ("Modify".Equals(eventType))
			{
			oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_In " + HProcExchInterID + ",-1");
			//更新主表
			oCN.RunProc("UpDate Sc_StationInBillMain set " +
			" HBillNo='" + HBillNo + "'" +
			",HYear='" + HYear + "'" +
			",HPeriod='" + HPeriod + "'" +
			",HBillStatus='" + HBillStatus + "'" +
			",HRemark='" + HRemark + "'" +
			",HUpDater='" + HMaker + "'" +
			",HUpDateDate=getdate()" +
			",HSupID=" + HSupID +
			",HQty=" + HQty +
			",HPieceQty=" + HPieceQty +
			",HSourceName='" + HSourceName + "'" +
			",HICMOInterID=" + HICMOInterID +
			",HICMOBillNo='" + HICMOBillNo + "'" +
			",HProcPlanInterID=" + HProcPlanInterID +
			",HProcPlanEntryID=" + HProcPlanEntryID +
			",HProcPlanBillNo='" + HProcPlanBillNo + "'" +
			",HProcExchInterID=" + HProcExchInterID +
			",HProcExchEntryID=" + HProcExchEntryID +
			",HProcExchBillNo='" + HProcExchBillNo + "'" +
			",HMaterID=" + HMaterID +
			",HProcID=" + HProcID +
			",HICMOQty=" + HICMOQty +
			",HPlanQty=" + HPlanQty +
			",HStationInTime=getdate()" +
			",HSourceID=" + HSourceID +
			",HGroupID=" + HGroupID +
			",HDeptID=" + HDeptID +
			",HEmpID=" + HEmpID +
			",HBarCode='" + HBarCode + "'" +
			",HSaveBillFlag=0 " +
			",HAddr='" + HAddr + "'" +
			",HBarCodeMaker='" + HBarCodeMaker + "'" +
			",HProcNo='" + HProcNo + "'" +
			",HOrderProcNO='" + HOrderProcNO + "'" +
			" where HInterID=" + HInterID);
			}
			else
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "操作类型无效！";
			objJsonResult.data = null;
			return objJsonResult;
			}





			ds = oCN.RunProcReturn("exec h_p_MES_StationInBill_QtyCtrl " + HInterID + "", "h_p_MES_StationInBill_QtyCtrl");
			if (ds == null)
			{
			@@ -129,10 +399,10 @@
			" Where a.HInterID=" + HProcExchInterID + " and b.HEntryID=" + HProcExchEntryID + " ", "Sc_ProcessExchangeBillMain");
			if (ds1 == null \|\| ds1.Tables[0].Rows.Count == 0)
			{


			}
			else if (ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HFstProc"]) == "是")
			{
			{

			}
			oCN.Commit();
			@@ -151,6 +421,15 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			private bool AllowbillNo(string HBillNo)
			{
			ds = oCN.RunProcReturn("select HBillNo from Sc_StationInBillMain where HBillNo = '" + HBillNo + "'", "Sc_StationInBillMain");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			return true;
			}
			return false;
			}

			/// <summary>
			@@ -249,6 +528,47 @@
			}
			}

			/// <summary>
			/// 编辑页面根据id获取工序进站接收单信息
			///参数：string sql。
			///返回值：object。
			/// </summary>
			[Route("Cj_StationInBill/GetStationInBill")]
			[HttpGet]
			public object GetStationOutBill(int HInterID)
			{
			try
			{
			ds = oCN.RunProcReturn("select * from h_v_GetStationInBill where HInterID = " + HInterID, "h_v_GetStationInBill");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "工序进站接收单信息获取失败！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}




			//
			}