派生自 MES-WEB-API
WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -19,7 +19,7 @@ private json objJsonResult = new json(); SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); DataSet ds; @@ -136,7 +136,7 @@ objJsonResult.Message = "Sucess！"; objJsonResult.data = ds.Tables[0]; return objJsonResult; } catch (Exception e) { @@ -155,13 +155,15 @@ /// <returns></returns> [Route("Sc_ProcessMangement/SaveICMOReportBill")] [HttpGet] public object SaveICMOReportBill(string InterID, string user, string BillNo) public object SaveICMOReportBill(string InterID, string user, string BillNo, string OrganizationID) { try { //获取生产汇报单最大InterID和单据号 Int64 HInterID = DBUtility.ClsPub.CreateBillID("3711", ref DBUtility.ClsPub.sExeReturnInfo); string HBillNo = DBUtility.ClsPub.CreateBillCode("3711", ref DBUtility.ClsPub.sExeReturnInfo, true); //获取组织代码 string OrganizationNUM = oCN.RunProcReturn("select HNumber from Xt_ORGANIZATIONS where HItemID=" + OrganizationID, "Xt_ORGANIZATIONS").Tables[0].Rows[0]["HNumber"].ToString(); //根据工序汇报单主ID获取工序汇报入库单的数据 DataSet ds = oCN.RunProcReturn("select * from h_v_MES_StationOutBillList_LastProc where HInterID=" + InterID, "h_v_MES_StationOutBillList_LastProc"); DataRow dr = ds.Tables[0].Rows[0]; @@ -210,52 +212,80 @@ return objJsonResult; } //根据任务单查找到金蝶的生产订单 DataSet ds1 = oCN.RunProcReturn("SELECT * FROM AIS20210811135644..T_PRD_MO where FID=(select HERPInterID from Sc_ICMOBillMain where HBillNo='" + dr["任务单"].ToString() + "')", "AIS20210811135644..T_PRD_MO"); DataSet ds1 = oCN.RunProcReturn("select * from h_v_TOERP_StationOutBillList_LastProc where HICMOInterID=" + dr["HICMOInterID"].ToString(), "h_v_TOERP_StationOutBillList_LastProc"); DataRow dr1 = ds1.Tables[0].Rows[0]; JObject model = new JObject(); model.Add("FBillType", new JObject() { ["Fnumber"] = "50fa7c2eda7947b89fab5431bf25d48e" }); //单据类型1 model.Add("FBillType", new JObject() { ["Fnumber"] = "SCHBD01_SYS" }); //单据类型生产汇报“SCHBD02_SYS” 入库汇报SCHBD01_SYS model.Add("FPrdOrgId", new JObject() { ["Fnumber"] = dr1["FPrdOrgNUMBER"].ToString() }); //生产组织1 model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //单据日期1 model.Add("FHZYMESFLAG", "是");// 是否为MES同步 JArray Fentity = new JArray(); foreach (DataRow item in ds.Tables[0].Rows) { JObject FentityModel = new JObject(); FentityModel.Add("FReportType", "BD_OwnerOrg");//生产汇报类型 FentityModel.Add("FTimeUnitId", "BD_OwnerOrg");//时间单位 FentityModel.Add("FWorkshipId", new JObject() { ["Fnumber"] = item["FWorkShopID"].ToString() }); // 生产车间 FentityModel.Add("FStandHourUnitId", new JObject() { ["Fnumber"] = item["FUNITNUMBER"].ToString() }); // 单位标准工时单位 FentityModel.Add("FMaterialId", new JObject() { ["Fnumber"] = item["产品代码"].ToString() }); // 物料编码 FentityModel.Add("FIsNew", false);// 源单类型 FentityModel.Add("FReportType", new JObject() { ["Fnumber"] = dr1["FREPORTTYPENUMBER"].ToString() });//生产汇报类型 FentityModel.Add("FSrcBillType", "PRD_MO");// 源单类型 FentityModel.Add("FProductType", "1");// 产品类型 FentityModel.Add("FSrcBillNo", item["任务单"].ToString());// 源单编号 FentityModel.Add("FSrcInterId", dr1["FMOID"].ToString());// 源单内码 FentityModel.Add("FSrcEntryId", dr1["FMOENTRYID"].ToString());// 源单分录内码、 FentityModel.Add("FSRCENTRYSEQ", dr1["FMOENTRYSEQ"].ToString());// 源单分录行号 FentityModel.Add("FUNITID", new JObject() { ["Fnumber"] = dr1["FUNITNUMBER"].ToString() });//单位 FentityModel.Add("FTimeUnitId", "1");//时间单位 FentityModel.Add("FWorkshipId", new JObject() { ["Fnumber"] = dr1["FWorkShopNUM"].ToString() }); // 生产车间 FentityModel.Add("FStandHourUnitId", "3600"); // 单位标准工时单位 FentityModel.Add("FMaterialId", new JObject() { ["Fnumber"] = dr1["FMaterialNUM"].ToString() }); // 物料编码 FentityModel.Add("FMoEntrySeq", dr1["HICMOEntryID"].ToString());//生产订单行号 FentityModel.Add("FMoId", dr1["HICMOInterID"].ToString());//生产订单内码 FentityModel.Add("FFinishQty", item["接收数量"].ToString());//完成数量1 FentityModel.Add("FQuaQty", item["合格数量"].ToString());//合格数量1 FentityModel.Add("FQuaQty", item["合格数量"].ToString());//合格数量1FFailQty FentityModel.Add("FFailQty", item["不良数量"].ToString());//不合格数量 FentityModel.Add("FStockInOrgId ", new JObject() { ["Fnumber"] = OrganizationNUM });// 入库组织 FentityModel.Add("FStockId", new JObject() { ["Fnumber"] = dr1["FStockNUM"].ToString() }); // 仓库 FentityModel.Add("FMOID", dr1["FMOID"].ToString());// FentityModel.Add("FMOBILLNO", dr1["FMOBILLNO"].ToString());// FentityModel.Add("FMOENTRYID", dr1["FMOENTRYID"].ToString());// FentityModel.Add("FMOENTRYSEQ", dr1["FMOENTRYSEQ"].ToString());// FentityModel.Add("FOwnerTypeId", dr1["FOWNERTYPEID"].ToString()); //货主类型：FOwnerTypeId(必填项) FentityModel.Add("FOwnerId", new JObject() { ["Fnumber"] = dr1["FOwnerNumber"].ToString() }); //货主：FOwnerId(必填项) FentityModel.Add("FBomId", new JObject() { ["Fnumber"] = dr1["FBOMNUM"].ToString() }); //BOM版本：FBomId(必填项) FentityModel.Add("FCostRate", dr1["FCostRate"].ToString());// 成本权重 FentityModel.Add("FISBACKFLUSH", dr1["FISBACKFLUSH"].ToString() == "1" ? true : false);// 倒冲领料 FentityModel.Add("F_bsv_Base1", new JObject() { ["Fnumber"] = dr1["FPREBDONENUMBER"].ToString() }); //包装标识 FentityModel.Add("FLot", new JObject() { ["FNumber"] = dr1["FBATCHNO"].ToString() }); //包装标识 //批号 //FFLOWID FFLOWLINEID FRULEID FSTABLENAME //f6e6eec3 - 5267 - 4f02 - 8593 - b633da508a72 3 PRD_MO2MORPT T_PRD_MOENTRY //业务流程图：FEntity_Link_FFlowId //推进路线：FEntity_Link_FFlowLineId //转换规则：FEntity_Link_FRuleId //源单表内码：FEntity_Link_FSTableId //源单表：FEntity_Link_FSTableName //源单内码：FEntity_Link_FSBillId //源单分录内码：FEntity_Link_FSId //原始携带量：FEntity_Link_FBaseQuaQtyOld //修改携带量：FEntity_Link_FBaseQuaQty FentityModel.Add("FOwnerID", new JObject() { ["Fnumber"] = item["FPURCHASEORGNUMBER"].ToString() });//货主 FentityModel.Add("FSrcId", item["FID"].ToString());//源单内码 FentityModel.Add("FSRCFORMID", "PUR_PurchaseOrder");//源单类型 FentityModel.Add("FSrcBillNo", item["FBILLNO"].ToString());//源单单号 FentityModel.Add("FSRCENTRYID", item["FENTRYID"].ToString());//源单分录内码 FentityModel.Add("FORDERBILLNO", item["FBILLNO"].ToString());//源单单号 FentityModel.Add("FPOORDERENTRYID", item["FENTRYID"].ToString());//源单分录内码 FentityModel.Add("FTLId", item["HID"].ToString());//提料源单内码 FentityModel.Add("FTLentryId", item["HENTRYID"].ToString());//提料源单分录内码 FentityModel.Add("FTLOrderNo", item["HBILLNO"].ToString());//提料源单分录内码 FentityModel.Add("FPrice", item["FPRICE"].ToString());//单价 FentityModel.Add("FTaxPrice", item["FTAXPRICE"].ToString());//含税单价 FentityModel.Add("FEntryTaxRate", item["FTAXRATE"].ToString());//税率 FentityModel.Add("F_QIMB_Text", item["FXQD"].ToString());//需求单号 //JArray Fentity2 = new JArray(); //JObject FentityModel2 = new JObject(); //FentityModel2.Add("FDetailEntity_Link_FRULEID", "PUR_PurchaseOrder-PUR_ReceiveBill"); //FentityModel2.Add("FDetailEntity_Link_FSTableName", "t_PUR_POOrderEntry"); //FentityModel2.Add("FDetailEntity_Link_FSBillId", item["FID"].ToString()); //FentityModel2.Add("FDetailEntity_Link_FSId", item["FEntryID"].ToString()); //Fentity2.Add(FentityModel2); //FentityModel.Add("FDetailEntity_Link", Fentity2); //Fentity.Add(FentityModel); JArray Fentity2 = new JArray(); JObject FentityModel2 = new JObject(); FentityModel2.Add("FEntity_Link_FFlowId", "f6e6eec3-5267-4f02-8593-b633da508a72"); FentityModel2.Add("FEntity_Link_FFlowLineId", "PRD_MO2MORPT"); FentityModel2.Add("FEntity_Link_FRuleId", "3"); FentityModel2.Add("FEntity_Link_FSTableId", "0"); FentityModel2.Add("FEntity_Link_FSTableName", "T_PRD_MOENTRY"); FentityModel2.Add("FEntity_Link_FSBillId", dr1["FMOID"].ToString()); FentityModel2.Add("FEntity_Link_FSId", dr1["FMOENTRYID"].ToString()); FentityModel2.Add("FEntity_Link_FBaseQuaQtyOld", item["合格数量"].ToString()); FentityModel2.Add("FEntity_Link_FBaseQuaQty", item["合格数量"].ToString()); Fentity2.Add(FentityModel2); FentityModel.Add("FEntity_Link", Fentity2); FentityModel.Add("FBFLowId", new JObject() { ["FID"] = "f6e6eec3-5267-4f02-8593-b633da508a72" }); // Fentity.Add(FentityModel); } model.Add("FDetailEntity", Fentity); //明细信息 model.Add("FEntity", Fentity); //明细信息 JObject jsonRoot = new JObject() { ["Creator"] = "", @@ -267,10 +297,12 @@ //["IsAutoSubmitAndAudit"] = true,//自动调用提交和审核功能 ["Model"] = model }; string result = InvokeHelper.Submit("PRD_PPBOM", JsonConvert.SerializeObject(json)); //判断审核是否成功 LogService.Write("jsonRoot:" + jsonRoot); string result = InvokeHelper.Save("PRD_MORPT", JsonConvert.SerializeObject(jsonRoot));//保存 //判断保存是否成功 if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE") { oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; @@ -278,7 +310,32 @@ objJsonResult.data = null; return objJsonResult; } //提交审核 string result1 = string.Empty; string result2 = string.Empty; var fID = JObject.Parse(result)["Result"]["Id"].ToString(); var fBillNo = JObject.Parse(result)["Result"]["Number"].ToString(); var json = new { Ids = fID, }; result1 = InvokeHelper.Submit("PRD_MORPT", JsonConvert.SerializeObject(json));//提交 result2 = InvokeHelper.Audit("PRD_MORPT", JsonConvert.SerializeObject(json));//提交 if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE") { oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = $"生产汇报单单号：{fBillNo}，提交失败" + result; objJsonResult.data = null; return objJsonResult; } oCN.Commit(); objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "保存成功！"; objJsonResult.data = 1; return objJsonResult; } catch (Exception e) { @@ -299,7 +356,7 @@ /// </summary> [Route("Sc_ProcessMangement/MES_Sc_ProcessReportList_Json")] [HttpGet] public object MES_Sc_ProcessReportList_Json(string sWhere,string user) public object MES_Sc_ProcessReportList_Json(string sWhere, string user) { DataSet ds; try @@ -322,7 +379,7 @@ else { string sql1 = "select * from h_v_Sc_ProcessReportList where 1 = 1 "; string sql = sql1 + sWhere+ " order by hmainid desc"; string sql = sql1 + sWhere + " order by hmainid desc"; ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessReportList"); } } @@ -350,11 +407,11 @@ try { SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); if (HInterID<=0) if (HInterID <= 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "HInterID小于0！" ; objJsonResult.Message = "HInterID小于0！"; objJsonResult.data = null; return objJsonResult; } @@ -367,9 +424,9 @@ inner join Gy_Department s2 on s1.HDeptID=s2.HItemID and s1.HInterID=" + HInterID; ds = oCN.RunProcReturn(sql1, "Sc_ProcessReportMain"); } } catch (Exception e) { @@ -406,12 +463,12 @@ else { string sql1 =@"select [hmainid], [日期], [单据号], [HDeptID], [部门代码], [部门], [HMaterID], [物料代码], [物料名称], [规格型号], [HUnitID], [计量单位代码], [计量单位], [HprocID], string sql1 = @"select [hmainid], [日期], [单据号], [HDeptID], [部门代码], [部门], [HMaterID], [物料代码], [物料名称], [规格型号], [HUnitID], [计量单位代码], [计量单位], [HprocID], [工序代码], [工序], [HGroupID], [班组代码], [班组名称], [HSourceID], [资源代码], [生产资源], [HWorkerID], [职员代码], [职员], [hsubid], [数量], [计划开工日期], [计划完工日期], [计划工时], [表体备注], [HICMOInterID], [生产任务单号], [HSeOrderInterID], [销售订单号], [表头备注], [制单人], [制单日期], [审核人], [审核日期], [修改人], [修改日期], [关闭人], [关闭日期], [作废人], [作废日期], [源单主内码], [源单子内码], [源单单号], [源单类型], [行关闭人], [HBillType], [HQtyDecimal], [HPriceDecimal] from h_v_Sc_ProcessSendWorkList where hmainid=(select HSourceID from Sc_ProcessReportSub where HInterID="+HInterID+")"; where hmainid=(select HSourceID from Sc_ProcessReportSub where HInterID=" + HInterID + ")"; ds = oCN.RunProcReturn(sql1, "h_v_Sc_ProcessSendWorkList"); @@ -441,7 +498,7 @@ /// </summary> [Route("Sc_ProcessMangement/MES_Sc_ProcessPlanMain_Json")] [HttpGet] public object MES_Sc_ProcessPlanMain_Json(string sWhere,string user) public object MES_Sc_ProcessPlanMain_Json(string sWhere, string user) { DataSet ds; try @@ -463,7 +520,7 @@ else { string sql1 = "select * from h_v_Sc_ProcessPlanList where 1 = 1 "; string sql = sql1 + sWhere+ " order by hmainid desc "; string sql = sql1 + sWhere + " order by hmainid desc "; ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessPlanList"); } } @@ -543,7 +600,7 @@ ",HRemark,HInnerBillNo,HMaker,HMakeDate" + ") " + " values(" + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + BillType + "','" + BillType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HDate.ToShortDateString() + "','" + omodel.HBillNo + "'," + (omodel.HBillStatus=1) + "," + omodel.HCheckItemNowID.ToString() + "," + omodel.HCheckItemNextID.ToString() + ",'" + omodel.HDate.ToShortDateString() + "','" + omodel.HBillNo + "'," + (omodel.HBillStatus = 1) + "," + omodel.HCheckItemNowID.ToString() + "," + omodel.HCheckItemNextID.ToString() + "," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOBillNo + "'," + omodel.HMaterID.ToString() + ",'" + omodel.HMaterNumber + "'," + omodel.HUnitID.ToString() + ",'" + omodel.HUnitNumber + "'," + omodel.HPlanQty.ToString() + ",'" + omodel.HPlanBeginDate.ToShortDateString() + "','" + omodel.HPlanEndDate.ToShortDateString() + "','" + omodel.HExplanation + "'" + ",'" + omodel.HRemark + "','" + omodel.HInnerBillNo + "','" + omodel.HMaker + "',getdate()" + @@ -578,7 +635,7 @@ " where HInterID=" + omodel.HInterID.ToString()); //删除子表 oCN.RunProc("Delete From Sc_ProcessPlanSub where HInterID = " + omodel.HInterID.ToString()+ " and hentryid="+ hentryid); oCN.RunProc("Delete From Sc_ProcessPlanSub where HInterID = " + omodel.HInterID.ToString() + " and hentryid=" + hentryid); } //保存子表 objJsonResult = AddBillSub(msg3, hentryid); @@ -625,7 +682,7 @@ ",HBeginDayQty,HBeginFixQty,HFixWorkDays,HTrunWorkDays,HReadyTimes" + ",HReadyTime,HQueueTime,HMoveTime,HBatchNo" + ") values(" + omodel.HInterID.ToString() + "," +(hentryid==-1?i: hentryid) + ",'" + oSub.HBillNo + "'," + oSub.HProcNo.ToString() + "," + oSub.HProcID.ToString() + "," + oSub.HWorkingQty.ToString() + + omodel.HInterID.ToString() + "," + (hentryid == -1 ? i : hentryid) + ",'" + oSub.HBillNo + "'," + oSub.HProcNo.ToString() + "," + oSub.HProcID.ToString() + "," + oSub.HWorkingQty.ToString() + ",'" + oSub.HProcNumber + "','" + oSub.HWorkRemark + "'," + oSub.HCenterID.ToString() + "," + oSub.HDeptID.ToString() + ",'" + oSub.HDeptNumber + "'" + "," + oSub.HGroupID.ToString() + ",'" + oSub.HGroupNumber + "'," + oSub.HWorkerID.ToString() + ",'" + oSub.HWorkerNumber + "'," + oSub.HSourceID.ToString() + "," + oSub.HQty.ToString() + ",'" + oSub.HTimeUnit + "'," + oSub.HPlanWorkTimes.ToString() + ",'" + oSub.HPlanBeginDate.ToString() + "','" + oSub.HPlanEndDate.ToString() + "'" + @@ -734,7 +791,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "单据不存在;原因:"+DBUtility.ClsPub.sExeReturnInfo; objJsonResult.Message = "单据不存在;原因:" + DBUtility.ClsPub.sExeReturnInfo; objJsonResult.data = null; return objJsonResult; } @@ -750,7 +807,8 @@ objJsonResult.data = null; return objJsonResult; } else { else { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "审核失败,原因:" + DBUtility.ClsPub.sExeReturnInfo; @@ -788,7 +846,7 @@ objJsonResult.data = null; return objJsonResult; } } //审核 public bool CheckBill(Int64 lngBillKey, ref string sReturn) @@ -855,7 +913,7 @@ objJsonResult.data = null; return objJsonResult; } if (oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo)) { objJsonResult.code = "1"; @@ -893,7 +951,7 @@ /// <returns></returns> [Route("Sc_ProcessMangement/MES_Sc_ProcessSendWorkMain_Json")] [HttpGet] public object MES_Sc_ProcessSendWorkMain_Json(string sWhere,string user) public object MES_Sc_ProcessSendWorkMain_Json(string sWhere, string user) { DataSet ds; try @@ -916,7 +974,7 @@ else { string sql1 = "select * from h_v_Sc_ProcessSendWorkList where 1 = 1 "; string sql = sql1 + sWhere+ " order by hmainid desc "; string sql = sql1 + sWhere + " order by hmainid desc "; ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessSendWorkList"); } } @@ -938,7 +996,7 @@ /// <returns></returns> [Route("SaveProcessSendWork")] [HttpPost] public object SaveProcessSendWork([FromBody]JObject msg) public object SaveProcessSendWork([FromBody] JObject msg) { var _value = msg["msg"].ToString(); string msg1 = _value.ToString(); @@ -968,7 +1026,7 @@ msg2 = msg2.Replace("\\", ""); msg2 = msg2.Replace("\n", ""); lsmain = oListModels.getObjectByJson_SendWorkMain(msg2); foreach ( Model.ClsSc_ProcessSendWorkMain oItem in lsmain) foreach (Model.ClsSc_ProcessSendWorkMain oItem in lsmain) { UserName = oItem.HMaker; oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd")); @@ -1035,7 +1093,7 @@ objJsonResult.data = 1; return objJsonResult; } if (Convert.ToInt32( sendworksub.HQty) > Convert.ToInt32( oItemSub.计划数量)) if (Convert.ToInt32(sendworksub.HQty) > Convert.ToInt32(oItemSub.计划数量)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -1059,7 +1117,7 @@ sendworksub.HCloseType = false; sendworksub.HSourceBillType = oItemSub.HBillType; lss.Add(sendworksub);//先把数据存放到派工单子表集合里 } if (lss.Count > 0) @@ -1209,7 +1267,7 @@ sendworksub.HWorkerNumber = ""; //--操作工代码 sendworksub.HWorkerID = 0; //--操作工ID sendworksub.HGroupNumber = ""; //班组代码 sendworksub.HGroupID =0; //--班组ID sendworksub.HGroupID = 0; //--班组ID sendworksub.HSourceNumber = ""; //--生产资源代码 //--生产资源ID sendworksub.HProcNumber = ""; //--工序代码 @@ -1347,7 +1405,7 @@ /// <returns></returns> [Route("Sc_ProcessMangement/MES_QC_NoPassProdCheckBill_Json")] [HttpGet] public object MES_QC_NoPassProdCheckBill_Json(string sWhere,string user) public object MES_QC_NoPassProdCheckBill_Json(string sWhere, string user) { DataSet ds; try @@ -1370,7 +1428,7 @@ else { string sql1 = "select * from h_v_QC_NoPassProdCheckBillList where 1 = 1 "; string sql = sql1 + sWhere+ " order by hmainid desc "; string sql = sql1 + sWhere + " order by hmainid desc "; ds = oCN.RunProcReturn(sql, "h_v_QC_NoPassProdCheckBillList"); } } @@ -1433,7 +1491,7 @@ { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "删除失败!"+e.ToString(); objJsonResult.Message = "删除失败!" + e.ToString(); objJsonResult.data = null; return objJsonResult; } @@ -1570,7 +1628,7 @@ /// <returns></returns> [Route("SaveProcessReport")] [HttpPost] public object SaveProcessReport([FromBody] JObject msg) public object SaveProcessReport([FromBody] JObject msg) { var _value = msg["msg"].ToString(); string msg1 = _value.ToString(); @@ -1581,7 +1639,7 @@ List<WebAPI.Models.Sc_ProcessReportViewModel> ls = new List<WebAPI.Models.Sc_ProcessReportViewModel>(); ls = oListModels.getObjectByJson_Report(msg1); int i = 0; foreach (Models.Sc_ProcessReportViewModel ItemView in ls) { i++; @@ -1590,23 +1648,23 @@ //工序汇报单主表保存 ReportMain.HBillType = "3714"; ReportMain.HBillNo = ItemView.HBillNo; ReportMain.HMakeDate=DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd")); ReportMain.HYear=DBUtility.ClsPub.isLong(DateTime.Now.Year); ReportMain.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd")); ReportMain.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year); ReportMain.HDate = DateTime.Now; ReportMain.HMaker = ItemView.HEmp; ReportMain.HCloseType = false; ReportMain.HPlanQty = (double)ItemView.HQty; ReportMain.HMainSourceInterID = ItemView.HInterID; ReportMain.HInterID =0; ReportMain.HInterID = 0; ReportMain.HPeriod = 1; ReportMain.HBillSubType = "3714"; ReportMain.HBillStatus = 0; ReportMain.HCheckItemNowID = 0; ReportMain.HCheckItemNextID = 0; ReportMain.HICMOInterID= (long)ItemView.HICMOInterID; ReportMain.HICMOBillNo=ItemView.HICMOBillNo; ReportMain.HICMOInterID = (long)ItemView.HICMOInterID; ReportMain.HICMOBillNo = ItemView.HICMOBillNo; ReportMain.HDeptID = (long)ItemView.HDeptID; ReportMain.HDeptNumber =ItemView.HDeptNumber; ReportMain.HDeptNumber = ItemView.HDeptNumber; ReportMain.HGroupID = (long)ItemView.HGroupID; ReportMain.HGroupNumber = ItemView.HGroupNumber; ReportMain.HMaterID = (long)ItemView.HMaterID; @@ -1618,7 +1676,7 @@ ReportMain.HExplanation = ""; ReportMain.HInnerBillNo = ""; ReportMain.HSupID = 0; //保存到汇报单主表 @@ -1637,15 +1695,15 @@ ReportSub.HQty = (double)ItemView.HQty; ReportSub.HProcID = ItemView.HProcID; ReportSub.HProcNumber = ItemView.HProcNumber; ReportSub.HOutPrice =0; ReportSub.HOutPrice = 0; ReportSub.HOutMoney = 0; ReportSub.HSourceID = (long)ItemView.HSourceID; ReportSub.HEmpNumber = ""; ReportSub.HRelBeginDate = DateTime.Now; ReportSub.HRelEndDate = DateTime.Now; ReportSub.HTimes =3; ReportSub.HTimes = 3; ReportSub.HSeOrderInterID = 0; ReportSub.HSeOrderEntryID =0; ReportSub.HSeOrderEntryID = 0; ReportSub.HSeOrderBillNo = ""; ReportSub.HProcPlanInterID = 0; ReportSub.HProcPlanBillNo = ""; @@ -1655,44 +1713,44 @@ ReportSub.HRelationMoney = 0; ReportSub.HMaterID = (long)ItemView.HMaterID; ReportSub.HMaterNumber = ItemView.HMaterNumber; ReportSub.HCheckQty =0; ReportSub.HBadCount =0; ReportSub.HWasterQty =0; ReportSub.HWasterQty2 =0; ReportSub.HPrice =0; ReportSub.HMoney =0; ReportSub.HProcPlanInterID =0; ReportSub.HProcPlanEntryID =0; ReportSub.HProcPlanBillNo =""; ReportSub.HSourceEntryID =0; ReportSub.HSourceBillType =""; ReportSub.HRelationQty =0; ReportSub.HRelationMoney =0; ReportSub.HBadPrirce =0; ReportSub.HBadMoney =0; ReportSub.HWasterPrice =0; ReportSub.HWasterMoney =0; ReportSub.HQualityRate =0; ReportSub.HSecUnitQty1 =0; ReportSub.HSecUnitRate1=0; ReportSub.HSecUnitQty2=0; ReportSub.HSecUnitRate2=0; ReportSub.HUsingQty=0; ReportSub.HSelfBadCount=0; ReportSub.HPreBadCount=0; ReportSub.HPayMentQty=0; ReportSub.HOtherDeduct=0; ReportSub.HRelPay=0; ReportSub.HOtherItem1=""; ReportSub.HOtherItem2=""; ReportSub.HOtherItem3=""; ReportSub.HOtherItem4=""; ReportSub.HOtherItem5=""; ReportSub.HPackType=""; ReportSub.HCheckEmpID=0; ReportSub.HWeight=0; ReportSub.HBatchNo=""; ReportSub.HCheckQty = 0; ReportSub.HBadCount = 0; ReportSub.HWasterQty = 0; ReportSub.HWasterQty2 = 0; ReportSub.HPrice = 0; ReportSub.HMoney = 0; ReportSub.HProcPlanInterID = 0; ReportSub.HProcPlanEntryID = 0; ReportSub.HProcPlanBillNo = ""; ReportSub.HSourceEntryID = 0; ReportSub.HSourceBillType = ""; ReportSub.HRelationQty = 0; ReportSub.HRelationMoney = 0; ReportSub.HBadPrirce = 0; ReportSub.HBadMoney = 0; ReportSub.HWasterPrice = 0; ReportSub.HWasterMoney = 0; ReportSub.HQualityRate = 0; ReportSub.HSecUnitQty1 = 0; ReportSub.HSecUnitRate1 = 0; ReportSub.HSecUnitQty2 = 0; ReportSub.HSecUnitRate2 = 0; ReportSub.HUsingQty = 0; ReportSub.HSelfBadCount = 0; ReportSub.HPreBadCount = 0; ReportSub.HPayMentQty = 0; ReportSub.HOtherDeduct = 0; ReportSub.HRelPay = 0; ReportSub.HOtherItem1 = ""; ReportSub.HOtherItem2 = ""; ReportSub.HOtherItem3 = ""; ReportSub.HOtherItem4 = ""; ReportSub.HOtherItem5 = ""; ReportSub.HPackType = ""; ReportSub.HCheckEmpID = 0; ReportSub.HWeight = 0; ReportSub.HBatchNo = ""; //保存到汇报单子表 ReportModel.DetailColl.Add(ReportSub); } @@ -1768,7 +1826,7 @@ /// <returns></returns> [Route("SaveProcessReportList")] [HttpPost] public object SaveProcessReportList([FromBody] JObject msg) public object SaveProcessReportList([FromBody] JObject msg) { var _value = msg["msg"].ToString(); string msg1 = _value.ToString(); @@ -1831,7 +1889,7 @@ List<Model.ClsSc_ProcessReportSub> lsReportSub = new List<Model.ClsSc_ProcessReportSub>(); foreach (WebAPI.Models.Sc_ProcessSendWorkViewModel ItemView in ls) { i++; Model.ClsSc_ProcessReportSub reportSub = new Model.ClsSc_ProcessReportSub(); if (ItemView.数量 <= 0) @@ -1857,8 +1915,8 @@ reportSub.HRemark = ""; reportSub.HCloseMan = ReportModel.omodel.HCloseMan; reportSub.HCloseType = false; reportSub.HEmpID =0; reportSub.HICMOBillNo =""; reportSub.HEmpID = 0; reportSub.HICMOBillNo = ""; reportSub.HICMOInterID = (long)ItemView.HICMOInterID; reportSub.HRemark = ""; reportSub.HSourceBillType = "3712"; @@ -1924,7 +1982,7 @@ lsReportSub.Add(reportSub); } if (lsReportSub.Count>0) if (lsReportSub.Count > 0) { //然后在循环保存到汇报但子表 foreach (Model.ClsSc_ProcessReportSub item in lsReportSub) @@ -1993,7 +2051,7 @@ /// <returns></returns> [Route("SaveBadReasonList")] [HttpPost] public object SaveBadReasonList([FromBody] JObject msg) public object SaveBadReasonList([FromBody] JObject msg) { var _value = msg["msg"].ToString(); string msg1 = _value.ToString(); @@ -2003,7 +2061,7 @@ string user = sArray[2].ToString(); string UserName=""; string UserName = ""; ListModels oListModels = new ListModels(); try { @@ -2025,7 +2083,7 @@ foreach (Model.ClsQC_NoPassProdCheckBillMain oItem in lsmain) { //oItem.HMaker = ""; UserName=oItem.HMaker; UserName = oItem.HMaker; oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd")); oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year); oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); @@ -2033,7 +2091,7 @@ oItem.HBillSubType = "7509"; oItem.HBillStatus = 1; oItem.HPeriod = 0; oItem.HGroupName =""; oItem.HGroupName = ""; oItem.HSourceID = 0; oItem.HICMOInterID = 0; oItem.HICMOBillNo = ""; @@ -2053,7 +2111,7 @@ oItem.HMainSourceInterID = oItem.HInterID; oItem.HInterID = 0; //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo); if (DBUtility.ClsPub.isStrNull(oItem.HDate)=="") if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "") { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -2062,7 +2120,7 @@ return objJsonResult; } oBill.omodel = oItem; } } //表体数据 //按 },{来拆分数组 //去掉【和】 msg3 = msg3.Substring(1, msg3.Length - 2); @@ -2080,8 +2138,8 @@ break; } //将前台临时存放的值传过来的值赋给对应的不良数量字段 oItemSub.HBadQty = Convert.ToDecimal( oItemSub.HMRBChecker); if (oItemSub.HBadQty<=0) oItemSub.HBadQty = Convert.ToDecimal(oItemSub.HMRBChecker); if (oItemSub.HBadQty <= 0) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -2089,7 +2147,7 @@ objJsonResult.data = 1; return objJsonResult; } if ((double)oItemSub.HBadQty >oBill.omodel.HPlanQty ) if ((double)oItemSub.HBadQty > oBill.omodel.HPlanQty) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -2097,7 +2155,7 @@ objJsonResult.data = 1; return objJsonResult; } if (DBUtility.ClsPub.isStrNull(oItemSub.HWasterReasonName)=="") if (DBUtility.ClsPub.isStrNull(oItemSub.HWasterReasonName) == "") { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -2124,7 +2182,7 @@ oItemSub.HBadPCSQty = 0; oItemSub.HQCResultID = 0; oBill.DetailColl.Add(oItemSub); } //保存前判断(单据号重复，笔录项目) //保存 @@ -2177,10 +2235,10 @@ /// <returns></returns> [Route("CloseProcessReportList")] [HttpGet] public object CloseProcessReportList(int HInterID,int IsClose,string CurUserName) public object CloseProcessReportList(int HInterID, int IsClose, string CurUserName) { DataSet ds; string ModRightNameCheck = "Sc_ProcessReport_check"; string ModRightNameCheck = "Sc_ProcessReport_check"; try { //审核权限 @@ -2213,7 +2271,7 @@ } var HChecker = ds.Tables[0].Rows[0]["HChecker"].ToString(); var HCloseMan = ds.Tables[0].Rows[0]["HCloseMan"].ToString(); if (IsClose == 0) { if (HCloseMan.Trim() != "" || HChecker.Trim() == "") @@ -2230,8 +2288,8 @@ objJsonResult.Message = "* 单据关闭成功！"; objJsonResult.data = null; return objJsonResult; ; } else if(IsClose==1) } else if (IsClose == 1) { if (HCloseMan.Trim() == "" || HChecker.Trim() == "") { @@ -2258,7 +2316,7 @@ return objJsonResult; ; } } catch (Exception e) { @@ -2293,7 +2351,7 @@ objJsonResult.count = 0; objJsonResult.Message = "审核失败！无权限！"; objJsonResult.data = null; return objJsonResult; return objJsonResult; } SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); if (HInterID <= 0) @@ -2311,11 +2369,11 @@ objJsonResult.count = 0; objJsonResult.Message = "没有这个单据，无法审核！"; objJsonResult.data = null; return objJsonResult; return objJsonResult; } var HChecker = ds.Tables[0].Rows[0]["HChecker"].ToString();//取审核人 var HMaker=ds.Tables[0].Rows[0]["HMaker"].ToString();//取制单人 var HCloseMan=ds.Tables[0].Rows[0]["HCloseMan"].ToString();//取关闭人 var HMaker = ds.Tables[0].Rows[0]["HMaker"].ToString();//取制单人 var HCloseMan = ds.Tables[0].Rows[0]["HCloseMan"].ToString();//取关闭人 if (IsAudit == 0) { if (HChecker.Trim() != "" || HChecker.Trim() == HMaker || HCloseMan != "") @@ -2332,7 +2390,7 @@ objJsonResult.count = 1; objJsonResult.Message = "* 单据审核成功！"; objJsonResult.data = null; return objJsonResult; return objJsonResult; } else if (IsAudit == 1) { @@ -2350,7 +2408,7 @@ objJsonResult.count = 1; objJsonResult.Message = "* 单据反审核成功！"; objJsonResult.data = null; return objJsonResult; return objJsonResult; } else { @@ -2358,7 +2416,7 @@ objJsonResult.count = 0; objJsonResult.Message = "单据无法审核！"; objJsonResult.data = null; return objJsonResult; return objJsonResult; } @@ -2380,7 +2438,7 @@ /// <returns></returns> [Route("Sc_ProcessMangement/MES_WW_EntrustProcSendWorkBill_Json")] [HttpGet] public object MES_WW_EntrustProcSendWorkBill_Json(string sqlWhere,string user) public object MES_WW_EntrustProcSendWorkBill_Json(string sqlWhere, string user) { DataSet ds; try @@ -2403,7 +2461,7 @@ else { string sql1 = "select * from h_v_WW_EntrustProcSendWorkBillList where 1 = 1 "; string sql = sql1 + sqlWhere+ " order by hmainid desc "; string sql = sql1 + sqlWhere + " order by hmainid desc "; ds = oCN.RunProcReturn(sql, "h_v_WW_EntrustProcSendWorkBillList"); } } @@ -2425,7 +2483,7 @@ /// <returns></returns> [Route("Sc_ProcessMangement/MES_WW_EntrustProcessReportBill_Json")] [HttpGet] public object MES_WW_EntrustProcessReportBill_Json(string sqlWhere,string user) public object MES_WW_EntrustProcessReportBill_Json(string sqlWhere, string user) { DataSet ds; try @@ -2469,8 +2527,8 @@ /// <param name="sqlWhere"></param> /// <returns></returns> [Route("Sc_ProcessMangement/MES_WW_EntrustProcessSendOutBillList_Json")] [HttpGet] public object MES_WW_EntrustProcessSendOutBillList_Json(string sqlWhere,string user) [HttpGet] public object MES_WW_EntrustProcessSendOutBillList_Json(string sqlWhere, string user) { DataSet ds; try @@ -2493,7 +2551,7 @@ else { string sql1 = "select * from h_v_WW_EntrustProcessSendOutBillList where 1 = 1 "; string sql = sql1 + sqlWhere+ " order by hmainid desc "; string sql = sql1 + sqlWhere + " order by hmainid desc "; ds = oCN.RunProcReturn(sql, "h_v_WW_EntrustProcessSendOutBillList"); } } @@ -2600,7 +2658,7 @@ objJsonResult.data = 1; return objJsonResult; } sendworksub.HEntryID = i; sendworksub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now); @@ -2727,7 +2785,7 @@ ReportMain.HCloseType = false; ReportMain.HPrintQty = 0; ReportMain.HMainSourceBillType = "3740"; ReportMain.HMainSourceInterID =0; ReportMain.HMainSourceInterID = 0; ReportMain.HMainSourceBillNo = ItemView.HWW_BillNo; ReportMain.HInterID = 0; ReportMain.HPeriod = 1; @@ -2738,7 +2796,7 @@ ReportMain.HDeptID = Convert.ToInt32(ItemView.HDeptID); ReportMain.HExplanation = ""; ReportMain.HInnerBillNo = ""; ReportMain.HSupID =Convert.ToInt32( ItemView.HSupID); ReportMain.HSupID = Convert.ToInt32(ItemView.HSupID); //保存到汇报单主表 @@ -2755,7 +2813,7 @@ ReportSub.HCloseType = false; ReportSub.HSourceBillType = "3740"; ReportSub.HQty = Convert.ToDecimal(ItemView.HQty); ReportSub.HProcID =Convert.ToInt32( ItemView.HProcID); ReportSub.HProcID = Convert.ToInt32(ItemView.HProcID); ReportSub.HTimes = 0; ReportSub.HSeOrderInterID = 0; ReportSub.HSeOrderEntryID = 0; @@ -3167,7 +3225,7 @@ WorkOrdersub.HSourceInterID = oItemSub.hmainid.Value; //--源单id WorkOrdersub.HSourceEntryID = oItemSub.hsubid.Value; //--源单子ID WorkOrdersub.HSourceBillNo = oItemSub.单据号; //--源单单号 WorkOrdersub.HSourceBillType= oItemSub.HBillType; //--源单类型 WorkOrdersub.HSourceBillType = oItemSub.HBillType; //--源单类型 WorkOrdersub.HRelationQty = 0; //--关联数量 WorkOrdersub.HRelationMoney = 0; //--关联金额 WorkOrdersub.HOrderBillNo = ""; //--销售订单号 @@ -3177,9 +3235,9 @@ WorkOrdersub.HQty = (double)oItemSub.计划数量; //--订单数量 WorkOrdersub.HEntrustType = "3739"; //--委外类型 WorkOrdersub.HNextProcName = ""; //--下道工序 WorkOrdersub.HPrice =0; //加工费 WorkOrdersub.HPrice = 0; //加工费 WorkOrdersub.HOutQty = 0; //--关联发出数量 WorkOrdersub.HInQty =0; //--关联接收数量 WorkOrdersub.HInQty = 0; //--关联接收数量 WorkOrdersub.HBackSupDate = DateTime.Now; //--实际交货日期 WorkOrdersub.HInDate = DateTime.Now; //--交货日期 WorkOrdersub.HWorkProcFlow = ""; //--工艺流
