From 52d045baba836294f1d2e0878570bafe84edf107 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期五, 17 六月 2022 11:30:38 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API into master
---
WebAPI/Controllers/Sc_ProcessMangementController.cs | 197 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 196 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index b0a8e5a..7b20151 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -97,6 +98,200 @@
return objJsonResult;
}
+ #region 宸ュ簭姹囨姤鍏ュ簱
+ /// <summary>
+ /// 鑾峰彇宸ュ簭姹囨姤鍏ュ簱鍗曞垪琛�
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <param name="user"></param>
+ /// <returns></returns>
+ [Route("Sc_ProcessMangement/Get_ProcessReportOverList")]
+ [HttpGet]
+ public object Get_ProcessReportOverList(string sWhere, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_MES_StationOutBillList_LastProc order by hmainid desc", "h_v_MES_StationOutBillList_LastProc");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_MES_StationOutBillList_LastProc where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by hmainid desc";
+ ds = oCN.RunProcReturn(sql, "h_v_MES_StationOutBillList_LastProc");
+ }
+ 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;
+ }
+ }
+
+ /// <summary>
+ /// 鍏ュ簱鈥斺�旂敓浜ф眹鎶ュ崟
+ /// </summary>
+ /// <param name="InterID">宸ュ簭姹囨姤鍗曚富ID</param>
+ /// <returns></returns>
+ //[Route("Sc_ProcessMangement/SaveICMOReportBill")]
+ //[HttpGet]
+ //public object SaveICMOReportBill(string InterID, string user, string BillNo)
+ //{
+ // try
+ // {
+ // //鑾峰彇鐢熶骇姹囨姤鍗曟渶澶nterID鍜屽崟鎹彿
+ // Int64 HInterID = DBUtility.ClsPub.CreateBillID("3711", ref DBUtility.ClsPub.sExeReturnInfo);
+ // string HBillNo = DBUtility.ClsPub.CreateBillCode("3711", ref DBUtility.ClsPub.sExeReturnInfo, true);
+ // //鏍规嵁宸ュ簭姹囨姤鍗曚富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];
+ // //淇濆瓨
+ // oCN.BeginTran();
+ // //鐢熶骇姹囨姤鍗曚富琛�
+ // oCN.RunProc("Insert Into Sc_ICMOReportBillMain " +
+ // "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate,HBillStatus,HChecker,HCheckDate" +
+ // ",HYear,HPeriod,HRemark,HEmpID,HEmpNumber" +
+ // ",HGroupID,HDeptID,HDeptNumber" +
+ // ",HMainSourceBillNo,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillType" +
+ // ") " +
+ // " values('3711','3711'," + HInterID.ToString() + ",'" + HBillNo + "',getdate(),'" + user + "',getdate(),2,'" + user + "',getdate()" +
+ // ",DATENAME(YEAR,GETDATE()),0,'','" + dr["HEmpID"].ToString() + "','" + dr["鎿嶄綔鍛樹唬鐮�"].ToString() +
+ // "','" + dr["HGroupID"].ToString() + "',0,''" +
+ // ",'" + BillNo.ToString() + "'," + InterID.ToString() + ", 0,'3791'" +
+ // ") ");
+ // //鐢熶骇姹囨姤鍗曞瓙琛�
+ // oCN.RunProc("Insert into Sc_ICMOReportBillSub " +
+ // " (HInterID,HEntryID,HMaterID,HMaterNumber" +
+ // ",HQty,HUnitID,HUnitNumber,HTimes,HSourceID" +
+ // ",HQtyMust,HWorkerID,HWorkerNumber,HBadCount,HWasterQty," +
+ // "HCloseMan,HCloseType,HRemark," +
+ // "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ // ",HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
+ // ",HICMOInterID,HICMOBillNo,HBarCode" +
+ // ") values("
+ // + HInterID.ToString() + ",1," + dr["HMaterID"].ToString() + ",'" + dr["浜у搧浠ｇ爜"].ToString() + "'" +
+ // "," + dr["鍚堟牸鏁伴噺"].ToString() + ",0,'',0,0" +
+ // "," + dr["鎺ユ敹鏁伴噺"].ToString() + "," + dr["HEmpID"].ToString() + ",'" + dr["鎿嶄綔鍛樹唬鐮�"].ToString() + "'," + dr["涓嶈壇鏁伴噺"].ToString() + "," + dr["鎶ュ簾鏁伴噺"].ToString() +
+ // ",'',0,''" +
+ // "," + InterID.ToString() + ",0,'" + BillNo.ToString() + "','3791',0,0" +
+ // ",0,0,''" +
+ // "," + dr["HICMOInterID"].ToString() + ",'" + dr["浠诲姟鍗�"].ToString() + "',''" +
+ // ") ");
+ // //鍚屾閲戣澏
+ // //璁块棶閲戣澏
+ // var loginRet = InvokeHelper.Login();
+ // var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
+ // if (isSuccess == 0)
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鎿嶄綔澶辫触,閲戣澏璐﹀彿鐧诲綍寮傚父銆�" + loginRet;
+ // objJsonResult.data = null;
+ // 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");
+ // DataRow dr1 = ds1.Tables[0].Rows[0];
+
+ // JObject model = new JObject();
+ // model.Add("FBillType", new JObject() { ["Fnumber"] = "50fa7c2eda7947b89fab5431bf25d48e" }); //鍗曟嵁绫诲瀷1
+ // model.Add("FPrdOrgId", new JObject() { ["Fnumber"] = dr1["FPrdOrgNUMBER"].ToString() }); //鐢熶骇缁勭粐1
+ // model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //鍗曟嵁鏃ユ湡1
+ // 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("FFinishQty", item["鎺ユ敹鏁伴噺"].ToString());//瀹屾垚鏁伴噺1
+ // FentityModel.Add("FQuaQty", item["鍚堟牸鏁伴噺"].ToString());//鍚堟牸鏁伴噺1
+
+
+ // 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);
+ // }
+ // model.Add("FDetailEntity", Fentity); //鏄庣粏淇℃伅
+ // JObject jsonRoot = new JObject()
+ // {
+ // ["Creator"] = "",
+ // ["NeedUpDateFields"] = new JArray(),
+ // ["NeedReturnFields"] = new JArray(),
+ // ["IsDeleteEntry"] = "false",
+ // ["SubSystemId"] = "",
+ // ["IsVerifyBaseDataField"] = "false",
+ // //["IsAutoSubmitAndAudit"] = true,//鑷姩璋冪敤鎻愪氦鍜屽鏍稿姛鑳�
+ // ["Model"] = model
+ // };
+ // string result = InvokeHelper.Submit("PRD_PPBOM", JsonConvert.SerializeObject(json));
+ // //鍒ゆ柇瀹℃牳鏄惁鎴愬姛
+ // if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ // {
+ // oCN.RollBack();
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = $"宸ュ簭姹囨姤鍏ュ簱鍗曞悓姝ラ噾铦朵簯澶辫触锛佸崟鍙�:{dr["鍗曟嵁鍙�"].ToString()}" + result;
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // oCN.Commit();
+ // }
+ // catch (Exception e)
+ // {
+ // oCN.RollBack();
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "Exception锛�" + e.ToString();
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ //}
+ #endregion
+
/// <summary>
/// 杩斿洖鐢熶骇姹囨姤鍗曞垪琛�
///鍙傛暟锛歴tring sql銆�
--
Gitblit v1.9.1