From db054d938d008ea7f968eef47120b806bb476f98 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 18 十月 2022 14:25:57 +0800
Subject: [PATCH] 功能维护
---
WebAPI/Controllers/Sc_ProcessMangementController.cs | 1432 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 1,293 insertions(+), 139 deletions(-)
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index 981824b..aaf700a 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;
@@ -6,6 +7,7 @@
using System.Data;
using System.Data.SqlClient;
using System.Web.Http;
+using WebAPI.DLL;
using WebAPI.Models;
using WebAPI.Service;
@@ -17,6 +19,10 @@
private json objJsonResult = new json();
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
///<summary>
///灏佽鐘舵�佺爜鍙婅繑鍥炰俊鎭殑鍏敤鏂规硶銆�
///鍙傛暟锛欴ataSet銆�
@@ -26,22 +32,22 @@
{
try
{
- 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 = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
+ //if (ds.Tables[0].Rows.Count != 0 || ds != null)
+ //{
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ //}
+ //else
+ //{
+ //objJsonResult.code = "0";
+ //objJsonResult.count = 0;
+ //objJsonResult.Message = "鏃犳暟鎹�";
+ //objJsonResult.data = null;
+ //return objJsonResult;
+ //}
}
catch (Exception e)
{
@@ -92,6 +98,260 @@
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, string OrganizationID)
+ {
+ try
+ {
+ //鑾峰彇鐢熶骇姹囨姤鍗曟渶澶nterID鍜屽崟鎹彿
+ 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];
+ //淇濆瓨
+ 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 h_v_TOERP_StationOutBillList_LastProc where HICMOEntryID=" + dr["HICMOEntryID"].ToString(), "h_v_TOERP_StationOutBillList_LastProc");
+ DataRow dr1 = ds1.Tables[0].Rows[0];
+
+ JObject model = new JObject();
+ model.Add("FBillType", new JObject() { ["Fnumber"] = "SCHBD01_SYS" }); //鍗曟嵁绫诲瀷鐢熶骇姹囨姤鈥淪CHBD02_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", "鏄�");// 鏄惁涓篗ES鍚屾
+ model.Add("FBillNo", HBillNo);
+
+ JArray Fentity = new JArray();
+
+ foreach (DataRow item in ds.Tables[0].Rows)
+ {
+ JObject FentityModel = new JObject();
+ 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["FMOENTRYSEQ"].ToString());//鐢熶骇璁㈠崟琛屽彿
+ FentityModel.Add("FMoId", dr1["HICMOInterID"].ToString());//鐢熶骇璁㈠崟鍐呯爜
+ FentityModel.Add("FFinishQty", 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()); //璐т富绫诲瀷锛欶OwnerTypeId(蹇呭～椤�)
+ FentityModel.Add("FOwnerId", new JObject() { ["Fnumber"] = dr1["FOwnerNumber"].ToString() }); //璐т富锛欶OwnerId(蹇呭～椤�)
+ FentityModel.Add("FBomId", new JObject() { ["Fnumber"] = dr1["FBOMNUM"].ToString() }); //BOM鐗堟湰锛欶BomId(蹇呭～椤�)
+ 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
+ //鎺ㄨ繘璺嚎锛欶Entity_Link_FFlowLineId
+ //杞崲瑙勫垯锛欶Entity_Link_FRuleId
+ //婧愬崟琛ㄥ唴鐮侊細FEntity_Link_FSTableId
+ //婧愬崟琛細FEntity_Link_FSTableName
+ //婧愬崟鍐呯爜锛欶Entity_Link_FSBillId
+ //婧愬崟鍒嗗綍鍐呯爜锛欶Entity_Link_FSId
+ //鍘熷鎼哄甫閲忥細FEntity_Link_FBaseQuaQtyOld
+ //淇敼鎼哄甫閲忥細FEntity_Link_FBaseQuaQty
+
+ 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("FEntity", Fentity); //鏄庣粏淇℃伅
+ JObject jsonRoot = new JObject()
+ {
+ ["Creator"] = "",
+ ["NeedUpDateFields"] = new JArray(),
+ ["NeedReturnFields"] = new JArray(),
+ ["IsDeleteEntry"] = "false",
+ ["SubSystemId"] = "",
+ ["IsVerifyBaseDataField"] = "false",
+ //["IsAutoSubmitAndAudit"] = true,//鑷姩璋冪敤鎻愪氦鍜屽鏍稿姛鑳�
+ ["Model"] = model
+ };
+
+ string result = InvokeHelper.Save("PRD_MORPT", JsonConvert.SerializeObject(jsonRoot));//淇濆瓨
+ //鍒ゆ柇淇濆瓨鏄惁鎴愬姛
+ if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ {
+ LogService.Write("宸ュ簭姹囨姤鍗曞叆搴撻敊璇痡sonRoot:" + jsonRoot);
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = $"宸ュ簭姹囨姤鍏ュ簱鍗曞悓姝ラ噾铦朵簯澶辫触锛佸崟鍙�:{dr["鍗曟嵁鍙�"].ToString()}" + result;
+ 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)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
/// <summary>
/// 杩斿洖鐢熶骇姹囨姤鍗曞垪琛�
///鍙傛暟锛歴tring sql銆�
@@ -99,20 +359,30 @@
/// </summary>
[Route("Sc_ProcessMangement/MES_Sc_ProcessReportList_Json")]
[HttpGet]
- public object MES_Sc_ProcessReportList_Json(string sWhere)
+ public object MES_Sc_ProcessReportList_Json(string sWhere, string user)
{
DataSet ds;
try
{
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sc_ICMOReportBillQuery", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select top 500 * from h_v_Sc_ProcessReportList ", "h_v_Sc_ProcessReportList");
+ ds = oCN.RunProcReturn("select top 500 * from h_v_Sc_ProcessReportList order by hmainid desc", "h_v_Sc_ProcessReportList");
}
else
{
string sql1 = "select * from h_v_Sc_ProcessReportList where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere + " order by hmainid desc";
ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessReportList");
}
}
@@ -140,11 +410,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;
}
@@ -157,9 +427,9 @@
inner join Gy_Department s2 on s1.HDeptID=s2.HItemID and s1.HInterID=" + HInterID;
ds = oCN.RunProcReturn(sql1, "Sc_ProcessReportMain");
-
+
}
-
+
}
catch (Exception e)
{
@@ -196,12 +466,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");
@@ -218,6 +488,12 @@
return GetObjectJson(ds);
}
+ #region 宸ュ簭璁″垝鍗�
+ List<ClsSc_ProcessPlanSub> DetailColl = new List<ClsSc_ProcessPlanSub>();
+ ClsSc_ProcessPlanMain omodel = new ClsSc_ProcessPlanMain();
+ ClsSc_ProcessPlan oBill = new ClsSc_ProcessPlan();
+
+ #region 宸ュ簭璁″垝鍗曞垪琛�
/// <summary>
/// 杩斿洖鐢熶骇宸ュ簭璁″垝鍗曞垪琛�
///鍙傛暟锛歴tring sql銆�
@@ -225,20 +501,29 @@
/// </summary>
[Route("Sc_ProcessMangement/MES_Sc_ProcessPlanMain_Json")]
[HttpGet]
- public object MES_Sc_ProcessPlanMain_Json(string sWhere)
+ public object MES_Sc_ProcessPlanMain_Json(string sWhere, string user)
{
DataSet ds;
try
{
+ if (!DBUtility.ClsPub.Security_Log("Sc_ProcessPlan_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select top 500 * from h_v_Sc_ProcessPlanList ", "h_v_Sc_ProcessPlanList");
+ ds = oCN.RunProcReturn("select top 500 * from h_v_Sc_ProcessPlanList order by hmainid desc ", "h_v_Sc_ProcessPlanList");
}
else
{
string sql1 = "select * from h_v_Sc_ProcessPlanList where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere + " order by hmainid desc ";
ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessPlanList");
}
}
@@ -252,28 +537,447 @@
}
return GetObjectJson(ds);
}
+ #endregion
- /// <summary>
- /// 杩斿洖鐢熶骇宸ュ簭娲惧伐鍗曞垪琛�
- /// </summary>
- /// <param name="sWhere"></param>
- /// <returns></returns>
+ #region 宸ュ簭璁″垝鍗� 淇濆瓨/缂栬緫
+ //宸ュ簭璁″垝鍗� 淇濆瓨/缂栬緫
+ [Route("Sc_ProcessMangement/AddBill")]
+ [HttpPost]
+ public object AddBill([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ oCN.BeginTran();
+ //淇濆瓨涓昏〃
+ objJsonResult = AddBillMain(msg1);
+ if (objJsonResult.code == "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ public json AddBillMain(string msg1)
+ {
+ 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());//瀛愯〃鐨勯『搴廼d
+ int OperationType = int.Parse(sArray[3].ToString());//鏁版嵁绫诲瀷 1娣诲姞 3淇敼
+ string user = sArray[4].ToString();//鐢ㄦ埛鍚�
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sc_ProcessPlan_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愮紪杈�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ omodel = Newtonsoft.Json.JsonConvert.DeserializeObject<ClsSc_ProcessPlanMain>(msg2);
+ string BillType = "3715";
+
+
+ if (OperationType == 1)//鏂板
+ {
+ //涓昏〃
+ oCN.RunProc("Insert Into Sc_ProcessPlanMain " +
+ "(HYear,HPeriod,HBillType,HBillSubType,HInterID" +
+ ",HDate,HBillNo,HBillStatus,HCheckItemNowID,HCheckItemNextID" +
+ ",HICMOInterID,HICMOBillNo,HMaterID,HMaterNumber,HUnitID" +
+ ",HUnitNumber,HPlanQty,HPlanBeginDate,HPlanEndDate,HExplanation" +
+ ",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.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()" +
+ ") ");
+ }
+ else if (OperationType == 3)
+ {
+ //淇敼
+ oCN.RunProc("UpDate Sc_ProcessPlanMain set " +
+ " HYear=" + omodel.HYear.ToString() +
+ ",HPeriod=" + omodel.HPeriod.ToString() +
+ //",HInterID=" + omodel.HInterID.ToString() +
+ ",HDate='" + omodel.HDate.ToShortDateString() + "'" +
+ //",HBillNo='" + omodel.HBillNo + "'" +
+ ",HBillStatus=" + omodel.HBillStatus.ToString() +
+ ",HCheckItemNowID=" + omodel.HCheckItemNowID.ToString() +
+ ",HCheckItemNextID=" + omodel.HCheckItemNextID.ToString() +
+ ",HICMOInterID=" + omodel.HICMOInterID.ToString() +
+ ",HICMOBillNo='" + omodel.HICMOBillNo + "'" +
+ ",HMaterID=" + omodel.HMaterID.ToString() +
+ ",HMaterNumber='" + omodel.HMaterNumber + "'" +
+ ",HUnitID=" + omodel.HUnitID.ToString() +
+ ",HUnitNumber='" + omodel.HUnitNumber + "'" +
+ ",HPlanQty=" + omodel.HPlanQty.ToString() +
+ ",HPlanBeginDate='" + omodel.HPlanBeginDate.ToShortDateString() + "'" +
+ ",HPlanEndDate='" + omodel.HPlanEndDate.ToShortDateString() + "'" +
+ ",HExplanation='" + omodel.HExplanation + "'" +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
+ ",HUpDater='" + omodel.HUpDater + "'" +
+ ",HUpDateDate=getdate()" +
+ " where HInterID=" + omodel.HInterID.ToString());
+
+ //鍒犻櫎瀛愯〃
+ oCN.RunProc("Delete From Sc_ProcessPlanSub where HInterID = " + omodel.HInterID.ToString() + " and hentryid=" + hentryid);
+ }
+ //淇濆瓨瀛愯〃
+ objJsonResult = AddBillSub(msg3, hentryid);
+ if (objJsonResult.code == "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ public json AddBillSub(string msg3, int hentryid)
+ {
+ DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsSc_ProcessPlanSub>>(msg3);
+ int i = 1;
+ //鎻掑叆瀛愯〃
+ foreach (Models.ClsSc_ProcessPlanSub oSub in DetailColl)
+ {
+ oCN.RunProc("Insert into Sc_ProcessPlanSub " +
+ " (HInterID,HEntryID,HBillNo,HProcNo,HProcID,HWorkingQty" +
+ ",HProcNumber,HWorkRemark,HCenterID,HDeptID,HDeptNumber" +
+ ",HGroupID,HGroupNumber,HWorkerID,HWorkerNumber,HSourceID" +
+ ",HQty,HTimeUnit,HPlanWorkTimes,HPlanBeginDate,HPlanEndDate" +
+ ",HICMOInterID,HICMOBillNo,HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
+ ",HCloseMan,HCloseType,HRemark,HSourceInterID,HSourceEntryID" +
+ ",HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",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() +
+ ",'" + 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() + "'" +
+ "," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
+ ",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() +
+ ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HBeginDayQty.ToString() + "," + oSub.HBeginFixQty.ToString() + "," + oSub.HFixWorkDays.ToString() + "," + oSub.HTrunWorkDays.ToString() + "," + oSub.HReadyTimes.ToString() +
+ "," + oSub.HReadyTime.ToString() + "," + oSub.HQueueTime.ToString() + "," + oSub.HMoveTime.ToString() + ",'" + oSub.HBatchNo + "'" +
+ ") ");
+ i++;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ #endregion
+
+ #region 宸ュ簭璁″垝鍗� 瀹℃牳/鍙嶅鏍�
+ [Route("Sc_ProcessMangement/CheckDeOAuditBill")]
+ [HttpGet]
+ public object CheckDeOAuditBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "Sc_ProcessPlan_Check"; //璇ユā鍧楃殑瀹℃牳鍔熻兘
+ DBUtility.ClsPub.CurUserName = CurUserName;//瀛樺偍鐢ㄦ埛鍚�
+
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊鏍告潈闄�
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鍒ゆ柇id鏄惁澶т簬0
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "ID灏忎簬0";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //杞崲id
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID);
+
+ //鏌ヨ瀹℃牳鐨勮繖鏉℃暟鎹�
+ ds = oCN.RunProcReturn("select * from Sc_ProcessPlanMain where HInterID='" + HInterID + "'", "Sc_ProcessPlanMain");
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ string HCloseMan = ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim();//鍏抽棴浜�
+ string HDeleteMan = ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();//浣滃簾浜�
+ string HChecker = ds.Tables[0].Rows[0]["HChecker"].ToString().Trim();//瀹℃牳浜�
+
+ if (HCloseMan != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鍗曟嵁宸插叧闂�,涓嶈兘瀹℃牳";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (HDeleteMan != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鍗曟嵁宸蹭綔搴�,涓嶈兘瀹℃牳";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //IsAudit==0 瀹℃牳
+ if (IsAudit == 0)
+ {
+ if (HChecker != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鏁版嵁宸插鏍�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //IsAudit==1 鍙嶅鏍�
+ if (IsAudit == 1)
+ {
+ if (HChecker == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鏁版嵁鏈鏍�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�;鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //瀹℃牳鎻愪氦
+ if (IsAudit == 0)
+ {
+ if (CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触,鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //鍙嶅鏍告彁浜�
+ if (IsAudit == 1)
+ {
+ if (AbandonCheck(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�,鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触鎴栧弽瀹℃牳澶辫触" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+ //瀹℃牳
+ public bool CheckBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ string HChecker = DBUtility.ClsPub.CurUserName;//鐢ㄦ埛鍚�
+ oCN.BeginTran();//鎵撳紑浜嬪姟
+ oCN.RunProc("update Sc_ProcessPlanMain set HChecker='" + HChecker + "',HCheckDate='" + DateTime.Now + "',HBillStatus=2 where HInterID='" + lngBillKey + "'");
+ oCN.Commit();//鍏抽棴浜嬪姟
+ sReturn = "瀹℃牳鍗曟嵁鎴愬姛!";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+ //鍙嶅鏍�
+ public bool AbandonCheck(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ string HChecker = DBUtility.ClsPub.CurUserName;//鐢ㄦ埛鍚�
+ oCN.BeginTran();//鎵撳紑浜嬪姟
+ oCN.RunProc("update Sc_ProcessPlanMain set HChecker='',HCheckDate=null,HBillStatus=1 where HInterID='" + lngBillKey + "'");
+ oCN.Commit();//鍏抽棴浜嬪姟
+ sReturn = "鍙嶅鏍稿崟鎹垚鍔�!";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+ #endregion
+
+ #region 宸ュ簭璁″垝鍗� 鍒犻櫎
+ [Route("Sc_ProcessMangement/DeleteProcessBill")]
+ [HttpGet]
+ public object MouldDeleteBill(long HInterID, string User, string ModRightNameDelete)
+ {
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, User))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鍒犻櫎鏉冮檺";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+
+ if (oBill.omodel.HChecker != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬瀹℃牳鐘舵��,涓嶈兘鍒犻櫎!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎澶辫触";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬垹闄�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #endregion
+
+ /// <summary>
+ /// 杩斿洖鐢熶骇宸ュ簭娲惧伐鍗曞垪琛�
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
[Route("Sc_ProcessMangement/MES_Sc_ProcessSendWorkMain_Json")]
[HttpGet]
- public object MES_Sc_ProcessSendWorkMain_Json(string sWhere)
+ public object MES_Sc_ProcessSendWorkMain_Json(string sWhere, string user)
{
DataSet ds;
try
{
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sc_ProcessSendWork_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select top 500 * from h_v_Sc_ProcessSendWorkList ", "h_v_Sc_ProcessSendWorkList");
+ ds = oCN.RunProcReturn("select top 500 * from h_v_Sc_ProcessSendWorkList order by hmainid desc ", "h_v_Sc_ProcessSendWorkList");
}
else
{
string sql1 = "select * from h_v_Sc_ProcessSendWorkList where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere + " order by hmainid desc ";
ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessSendWorkList");
}
}
@@ -295,7 +999,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();
@@ -303,17 +1007,29 @@
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
+ string user = sArray[2].ToString();//鐢ㄦ埛鍚�
+
string UserName = "";
ListModels oListModels = new ListModels();
try
{
+ //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sc_ProcessSendWork_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愮紪杈�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
DAL.ClsSc_ProcessSendWork Sendwork = new DAL.ClsSc_ProcessSendWork();
List<Model.ClsSc_ProcessSendWorkMain> lsmain = new List<Model.ClsSc_ProcessSendWorkMain>();
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"));
@@ -380,7 +1096,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;
@@ -404,7 +1120,7 @@
sendworksub.HCloseType = false;
sendworksub.HSourceBillType = oItemSub.HBillType;
lss.Add(sendworksub);//鍏堟妸鏁版嵁瀛樻斁鍒版淳宸ュ崟瀛愯〃闆嗗悎閲�
-
+
}
if (lss.Count > 0)
@@ -479,11 +1195,23 @@
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
+ string user = sArray[2].ToString();
+
string UserName = "";
ListModels oListModels = new ListModels();
try
{
+ //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+ if (!DBUtility.ClsPub.Security_Log("WW_EntrustProcSendWorkBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愮紪杈�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
WebAPI.DLL.ClsSc_ProcessSendWork Sendwork = new WebAPI.DLL.ClsSc_ProcessSendWork();
List<WebAPI.Models.ClsSc_ProcessSendWorkMain> lsmain = new List<WebAPI.Models.ClsSc_ProcessSendWorkMain>();
msg2 = msg2.Replace("\\", "");
@@ -542,7 +1270,7 @@
sendworksub.HWorkerNumber = ""; //--鎿嶄綔宸ヤ唬鐮�
sendworksub.HWorkerID = 0; //--鎿嶄綔宸D
sendworksub.HGroupNumber = ""; //鐝粍浠ｇ爜
- sendworksub.HGroupID =0; //--鐝粍ID
+ sendworksub.HGroupID = 0; //--鐝粍ID
sendworksub.HSourceNumber = ""; //--鐢熶骇璧勬簮浠ｇ爜
//--鐢熶骇璧勬簮ID
sendworksub.HProcNumber = ""; //--宸ュ簭浠ｇ爜
@@ -680,20 +1408,30 @@
/// <returns></returns>
[Route("Sc_ProcessMangement/MES_QC_NoPassProdCheckBill_Json")]
[HttpGet]
- public object MES_QC_NoPassProdCheckBill_Json(string sWhere)
+ public object MES_QC_NoPassProdCheckBill_Json(string sWhere, string user)
{
DataSet ds;
try
{
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("QC_NoPassProdCheckBillQuery", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select top 500 * from h_v_QC_NoPassProdCheckBillList ", "h_v_QC_NoPassProdCheckBillList");
+ ds = oCN.RunProcReturn("select top 500 * from h_v_QC_NoPassProdCheckBillList order by hmainid desc ", "h_v_QC_NoPassProdCheckBillList");
}
else
{
string sql1 = "select * from h_v_QC_NoPassProdCheckBillList where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere + " order by hmainid desc ";
ds = oCN.RunProcReturn(sql, "h_v_QC_NoPassProdCheckBillList");
}
}
@@ -709,24 +1447,202 @@
}
/// <summary>
+ /// 涓嶅悎鏍艰瘎瀹� 鍒犻櫎
+ /// </summary>
+ /// <param name="HInterID"></param>
+ /// <param name="user"></param>
+ /// <returns></returns>
+ [Route("Sc_ProcessMangement/ProcessMangementDeleteBill")]
+ [HttpGet]
+ public object ProcessMangementDeleteBill(string HInterID, string user)
+ {
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("QC_NoPassProdCheckBill_Drop", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬垹闄�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from h_v_QC_NoPassProdCheckBillList where hmainid =" + HInterID + " ", "h_v_QC_NoPassProdCheckBillList");
+
+ if (ds.Tables[0].Rows[0]["瀹℃牳浜�"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�,涓嶈兘鍒犻櫎!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+ oCN.RunProc("Delete from QC_NoPassProdCheckBillMain where HInterID=" + HInterID);
+ oCN.RunProc("Delete from QC_NoPassProdCheckBillSub where HInterID=" + HInterID);
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛!";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触!" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #region 涓嶅悎鏍艰瘎瀹� 瀹℃牳/鍙嶅鏍�
+ [Route("Sc_ProcessMangement/AuditProcessMangement")]
+ [HttpGet]
+ public object AuditProcessMangement(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "QC_NoPassProdCheckBill_Check"; //璇ユā鍧楃殑瀹℃牳鍔熻兘
+ DBUtility.ClsPub.CurUserName = CurUserName;//瀛樺偍鐢ㄦ埛鍚�
+ try
+ {
+ ////鍒ゆ柇鏄惁鏈夊鏍告潈闄�
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "ID灏忎簬0";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID);//鏁版嵁杞崲
+
+ //鏌ヨ瀹℃牳鐨勬暟鎹�
+ ds = oCN.RunProcReturn("select * from QC_NoPassProdCheckBillMain where HInterID='" + HInterID + "'", "QC_NoPassProdCheckBillMain");
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ var hcloseman = ds.Tables[0].Rows[0]["HCloseMan"].ToString();//鍏抽棴浜�
+ var hdeleteman = ds.Tables[0].Rows[0]["HDeleteMan"].ToString();//浣滃簾浜�
+ var hchecker = ds.Tables[0].Rows[0]["HChecker"].ToString();//瀹℃牳浜�
+
+ if (hcloseman != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鍗曟嵁宸插叧闂�,鏃犳硶瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (hdeleteman != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鍗曟嵁宸蹭綔搴�,鏃犳硶瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //IsAudit==0 瀹℃牳
+ if (IsAudit == 1)
+ {
+ if (hchecker != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鍗曟嵁宸插鏍�,鏃犳硶鍐嶆瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //IsAudit==1 鍙嶅鏍�
+ if (IsAudit == 2)
+ {
+ if (hchecker == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鍗曟嵁鏈鏍�,鏃犳硶鍙嶅鏍�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�;鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //瀹℃牳鎻愪氦
+ if (IsAudit == 1)
+ {
+ oCN.RunProc(" Update QC_NoPassProdCheckBillMain set HChecker='" + CurUserName + "',HCheckDate='" + DateTime.Now + "',HBillStatus=2 Where HBillType='7509' and HInterID=" + HInterID);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙嶅鏍告彁浜�
+ if (IsAudit == 2)
+ {
+ oCN.RunProc(" Update QC_NoPassProdCheckBillMain set HChecker='',HCheckDate=null,HBillStatus=0 Where HBillType='7509' and HInterID=" + HInterID);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触鎴栧弽瀹℃牳澶辫触" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ /// <summary>
/// PDA宸ュ簭姹囨姤鍗曚繚瀛�
/// </summary>
/// <param name="msg"></param>
/// <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();
ListModels oListModels = new ListModels();
try
{
- WebAPI.DLL.ClsSc_ProcessReport ReportModel = new WebAPI.DLL.ClsSc_ProcessReport();
+ DAL.ClsSc_ProcessReport ReportModel = new DAL.ClsSc_ProcessReport();
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++;
@@ -735,23 +1651,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;
@@ -763,7 +1679,7 @@
ReportMain.HExplanation = "";
ReportMain.HInnerBillNo = "";
ReportMain.HSupID = 0;
-
+
//淇濆瓨鍒版眹鎶ュ崟涓昏〃
@@ -782,15 +1698,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 = "";
@@ -800,44 +1716,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);
}
@@ -913,18 +1829,29 @@
/// <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();
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
+
+ string user = sArray[2].ToString();//鐢ㄦ埛鍚�
string UserName;
ListModels oListModels = new ListModels();
try
{
- WebAPI.DLL.ClsSc_ProcessReport ReportModel = new WebAPI.DLL.ClsSc_ProcessReport();
+ //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sc_ICMOReportBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愮紪杈�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ DAL.ClsSc_ProcessReport ReportModel = new DAL.ClsSc_ProcessReport();
List<Model.ClsSc_ProcessReportMain> lsmain = new List<Model.ClsSc_ProcessReportMain>();
msg2 = msg2.Replace("\\", "");
msg2 = msg2.Replace("\n", ""); //\n
@@ -965,7 +1892,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)
@@ -991,8 +1918,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";
@@ -1058,7 +1985,7 @@
lsReportSub.Add(reportSub);
}
- if (lsReportSub.Count>0)
+ if (lsReportSub.Count > 0)
{
//鐒跺悗鍦ㄥ惊鐜繚瀛樺埌姹囨姤浣嗗瓙琛�
foreach (Model.ClsSc_ProcessReportSub item in lsReportSub)
@@ -1127,19 +2054,30 @@
/// <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();
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
+ string user = sArray[2].ToString();
- string UserName="";
+ string UserName = "";
ListModels oListModels = new ListModels();
try
{
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("QC_NoPassProdCheckBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
DLL.ClsQC_NoPassProdCheckBill oBill = new DLL.ClsQC_NoPassProdCheckBill();
List<Model.ClsQC_NoPassProdCheckBillMain> lsmain = new List<Model.ClsQC_NoPassProdCheckBillMain>();
msg2 = msg2.Replace("\\", "");
@@ -1148,7 +2086,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"));
@@ -1156,7 +2094,7 @@
oItem.HBillSubType = "7509";
oItem.HBillStatus = 1;
oItem.HPeriod = 0;
- oItem.HGroupName ="";
+ oItem.HGroupName = "";
oItem.HSourceID = 0;
oItem.HICMOInterID = 0;
oItem.HICMOBillNo = "";
@@ -1176,7 +2114,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;
@@ -1185,7 +2123,7 @@
return objJsonResult;
}
oBill.omodel = oItem;
- }
+ }
//琛ㄤ綋鏁版嵁
//鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
msg3 = msg3.Substring(1, msg3.Length - 2);
@@ -1203,8 +2141,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;
@@ -1212,7 +2150,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;
@@ -1220,7 +2158,7 @@
objJsonResult.data = 1;
return objJsonResult;
}
- if (DBUtility.ClsPub.isStrNull(oItemSub.HWasterReasonName)=="")
+ if (DBUtility.ClsPub.isStrNull(oItemSub.HWasterReasonName) == "")
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -1247,7 +2185,7 @@
oItemSub.HBadPCSQty = 0;
oItemSub.HQCResultID = 0;
oBill.DetailColl.Add(oItemSub);
-
+
}
//淇濆瓨鍓嶅垽鏂�(鍗曟嵁鍙烽噸澶嶏紝绗斿綍椤圭洰)
//淇濆瓨
@@ -1300,14 +2238,14 @@
/// <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
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -1336,7 +2274,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() == "")
@@ -1353,8 +2291,8 @@
objJsonResult.Message = "* 鍗曟嵁鍏抽棴鎴愬姛锛�";
objJsonResult.data = null;
return objJsonResult; ;
- }
- else if(IsClose==1)
+ }
+ else if (IsClose == 1)
{
if (HCloseMan.Trim() == "" || HChecker.Trim() == "")
{
@@ -1381,7 +2319,7 @@
return objJsonResult; ;
}
-
+
}
catch (Exception e)
{
@@ -1410,13 +2348,13 @@
try
{
//瀹℃牳鏉冮檺
- if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
objJsonResult.data = null;
- return objJsonResult;
+ return objJsonResult;
}
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (HInterID <= 0)
@@ -1434,11 +2372,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 != "")
@@ -1455,7 +2393,7 @@
objJsonResult.count = 1;
objJsonResult.Message = "* 鍗曟嵁瀹℃牳鎴愬姛锛�";
objJsonResult.data = null;
- return objJsonResult;
+ return objJsonResult;
}
else if (IsAudit == 1)
{
@@ -1473,7 +2411,7 @@
objJsonResult.count = 1;
objJsonResult.Message = "* 鍗曟嵁鍙嶅鏍告垚鍔燂紒";
objJsonResult.data = null;
- return objJsonResult;
+ return objJsonResult;
}
else
{
@@ -1481,7 +2419,7 @@
objJsonResult.count = 0;
objJsonResult.Message = "鍗曟嵁鏃犳硶瀹℃牳锛�";
objJsonResult.data = null;
- return objJsonResult;
+ return objJsonResult;
}
@@ -1503,20 +2441,30 @@
/// <returns></returns>
[Route("Sc_ProcessMangement/MES_WW_EntrustProcSendWorkBill_Json")]
[HttpGet]
- public object MES_WW_EntrustProcSendWorkBill_Json(string sqlWhere)
+ public object MES_WW_EntrustProcSendWorkBill_Json(string sqlWhere, string user)
{
DataSet ds;
try
{
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("WW_EntrustProcSendWorkBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (sqlWhere == null || sqlWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select top 500 * from h_v_WW_EntrustProcSendWorkBillList ", "h_v_WW_EntrustProcSendWorkBillList");
+ ds = oCN.RunProcReturn("select top 500 * from h_v_WW_EntrustProcSendWorkBillList order by hmainid desc ", "h_v_WW_EntrustProcSendWorkBillList");
}
else
{
string sql1 = "select * from h_v_WW_EntrustProcSendWorkBillList where 1 = 1 ";
- string sql = sql1 + sqlWhere;
+ string sql = sql1 + sqlWhere + " order by hmainid desc ";
ds = oCN.RunProcReturn(sql, "h_v_WW_EntrustProcSendWorkBillList");
}
}
@@ -1538,11 +2486,21 @@
/// <returns></returns>
[Route("Sc_ProcessMangement/MES_WW_EntrustProcessReportBill_Json")]
[HttpGet]
- public object MES_WW_EntrustProcessReportBill_Json(string sqlWhere)
+ public object MES_WW_EntrustProcessReportBill_Json(string sqlWhere, string user)
{
DataSet ds;
try
{
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("WW_EntrustProcessReportBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (sqlWhere == null || sqlWhere.Equals(""))
{
@@ -1573,20 +2531,30 @@
/// <returns></returns>
[Route("Sc_ProcessMangement/MES_WW_EntrustProcessSendOutBillList_Json")]
[HttpGet]
- public object MES_WW_EntrustProcessSendOutBillList_Json(string sqlWhere)
+ public object MES_WW_EntrustProcessSendOutBillList_Json(string sqlWhere, string user)
{
DataSet ds;
try
{
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("WW_EntrustProcessSendOutBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (sqlWhere == null || sqlWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select top 500 * from h_v_WW_EntrustProcessSendOutBillList ", "h_v_WW_EntrustProcessSendOutBillList");
+ ds = oCN.RunProcReturn("select top 500 * from h_v_WW_EntrustProcessSendOutBillList order by hmainid desc ", "h_v_WW_EntrustProcessSendOutBillList");
}
else
{
string sql1 = "select * from h_v_WW_EntrustProcessSendOutBillList where 1 = 1 ";
- string sql = sql1 + sqlWhere;
+ string sql = sql1 + sqlWhere + " order by hmainid desc ";
ds = oCN.RunProcReturn(sql, "h_v_WW_EntrustProcessSendOutBillList");
}
}
@@ -1617,11 +2585,23 @@
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
+ string user = sArray[2].ToString();//鐢ㄦ埛鍚�
+
string UserName = "";
ListModels oListModels = new ListModels();
try
{
+ //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+ if (!DBUtility.ClsPub.Security_Log("WW_EntrustProcessReportBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愮紪杈�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
WebAPI.DLL.ClsWW_EntrustProcessReportBill Sendwork = new WebAPI.DLL.ClsWW_EntrustProcessReportBill();
List<WebAPI.Models.ClsWW_EntrustProcessReportBillMain> lsmain = new List<WebAPI.Models.ClsWW_EntrustProcessReportBillMain>();
msg2 = msg2.Replace("\\", "");
@@ -1681,7 +2661,7 @@
objJsonResult.data = 1;
return objJsonResult;
}
-
+
sendworksub.HEntryID = i;
sendworksub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
@@ -1808,7 +2788,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;
@@ -1819,7 +2799,7 @@
ReportMain.HDeptID = Convert.ToInt32(ItemView.HDeptID);
ReportMain.HExplanation = "";
ReportMain.HInnerBillNo = "";
- ReportMain.HSupID =Convert.ToInt32( ItemView.HSupID);
+ ReportMain.HSupID = Convert.ToInt32(ItemView.HSupID);
//淇濆瓨鍒版眹鎶ュ崟涓昏〃
@@ -1836,7 +2816,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;
@@ -1925,11 +2905,23 @@
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
+ string user = sArray[1].ToString();//鐢ㄦ埛鍚�
+
string UserName = "";
ListModels oListModels = new ListModels();
try
{
+ //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+ if (!DBUtility.ClsPub.Security_Log("WW_EntrustProcessSendOutBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愮紪杈�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
WebAPI.DLL.ClsWW_EntrustProcessSendOutBill Sendwork = new WebAPI.DLL.ClsWW_EntrustProcessSendOutBill();
List<WebAPI.Models.ClsWW_EntrustProcessSendOutBillMain> lsmain = new List<WebAPI.Models.ClsWW_EntrustProcessSendOutBillMain>();
msg2 = msg2.Replace("\\", "");
@@ -2177,6 +3169,168 @@
}
+ /// <summary>
+ /// 淇濆瓨濮斿宸ュ崟淇℃伅
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("SaveWWWorkOrder")]
+ [HttpPost]
+ public object SaveWWWorkOrder([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+
+ string UserName = "";
+ ListModels oListModels = new ListModels();
+
+ try
+ {
+ WebAPI.DLL.ClsWW_EntrustWorkOrderBill WorkOrder = new WebAPI.DLL.ClsWW_EntrustWorkOrderBill();
+ List<Models.ClsWW_EntrustWorkOrderBillMain> lsmain = new List<Models.ClsWW_EntrustWorkOrderBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", "");
+ lsmain = oListModels.getObjectByJson_WorkOrderMain(msg2);
+ foreach (Models.ClsWW_EntrustWorkOrderBillMain oItem in lsmain)
+ {
+ UserName = oItem.HMaker;
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HDate = DateTime.Now;
+ oItem.HMainSourceInterID = oItem.HInterID;
+ oItem.HInterID = 0;
+
+
+
+ WorkOrder.omodel = oItem;
+
+
+ }
+
+ //琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ List<WebAPI.Models.Sc_ProcessPlanViewModel> ls = new List<WebAPI.Models.Sc_ProcessPlanViewModel>();
+ ls = oListModels.getObjectByJson_SendWorkSub(msg3);
+ int i = 0;
+ List<Models.ClsWW_EntrustWorkOrderBillSub> lss = new List<Models.ClsWW_EntrustWorkOrderBillSub>();
+ foreach (WebAPI.Models.Sc_ProcessPlanViewModel oItemSub in ls)
+ {
+
+ i++;
+ Models.ClsWW_EntrustWorkOrderBillSub WorkOrdersub = new Models.ClsWW_EntrustWorkOrderBillSub();
+ WorkOrdersub.HProcID = oItemSub.hprocid.Value;//--宸ュ簭ID
+ WorkOrdersub.HSourceInterID = oItemSub.hmainid.Value; //--婧愬崟id
+ WorkOrdersub.HSourceEntryID = oItemSub.hsubid.Value; //--婧愬崟瀛怚D
+ WorkOrdersub.HSourceBillNo = oItemSub.鍗曟嵁鍙�; //--婧愬崟鍗曞彿
+ WorkOrdersub.HSourceBillType = oItemSub.HBillType; //--婧愬崟绫诲瀷
+ WorkOrdersub.HRelationQty = 0; //--鍏宠仈鏁伴噺
+ WorkOrdersub.HRelationMoney = 0; //--鍏宠仈閲戦
+ WorkOrdersub.HOrderBillNo = ""; //--閿�鍞鍗曞彿
+ WorkOrdersub.HMaterLenModel = ""; //--鏉愯川
+ WorkOrdersub.HMaterQty = 0; //--鏉愯川鏁伴噺
+ WorkOrdersub.HMaterID = oItemSub.HMaterID.Value; //--鐗╂枡
+ WorkOrdersub.HQty = (double)oItemSub.璁″垝鏁伴噺; //--璁㈠崟鏁伴噺
+ WorkOrdersub.HEntrustType = "3739"; //--濮斿绫诲瀷
+ WorkOrdersub.HNextProcName = ""; //--涓嬮亾宸ュ簭
+ WorkOrdersub.HPrice = 0; //鍔犲伐璐�
+ WorkOrdersub.HOutQty = 0; //--鍏宠仈鍙戝嚭鏁伴噺
+ WorkOrdersub.HInQty = 0; //--鍏宠仈鎺ユ敹鏁伴噺
+ WorkOrdersub.HBackSupDate = DateTime.Now; //--瀹為檯浜よ揣鏃ユ湡
+ WorkOrdersub.HInDate = DateTime.Now; //--浜よ揣鏃ユ湡
+ WorkOrdersub.HWorkProcFlow = ""; //--宸ヨ壓娴�
+ WorkOrdersub.HLeftMater = ""; //--浣欐枡鎯呭喌
+
+ if (oItemSub.璁″垝鏁伴噺 <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺" + i.ToString() + "琛屾暟閲忎笉澶т簬0鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (Convert.ToInt32(WorkOrdersub.HQty) > Convert.ToInt32(oItemSub.璁″垝鏁伴噺))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺" + i.ToString() + "琛屾淳宸ユ暟閲忎笉鑳藉ぇ浜庤鍒掑崟鏁伴噺锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ WorkOrdersub.HEntryID = i;
+ WorkOrdersub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ WorkOrdersub.HRemark = "";
+ WorkOrdersub.HCloseMan = "";
+ WorkOrdersub.HCloseType = false;
+ WorkOrdersub.HSourceBillType = oItemSub.HBillType;
+ lss.Add(WorkOrdersub);//鍏堟妸鏁版嵁瀛樻斁鍒板澶栧伐鍗曞瓙琛ㄩ泦鍚堥噷
+
+
+ }
+ if (lss.Count > 0)
+ {
+ //鐒跺悗鍐嶅惊鐜繚瀛樺埌濮斿宸ュ崟瀛愯〃鐨勯泦鍚堥噷
+ foreach (Models.ClsWW_EntrustWorkOrderBillSub Itemsendwork in lss)
+ {
+ WorkOrder.DetailColl.Add(Itemsendwork);
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛乴ss闆嗗悎灏忎簬0";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (WorkOrder.omodel.HInterID == 0)
+ {
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = WorkOrder.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = WorkOrder.ModifyBill(WorkOrder.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1