From b5995a148f7a9e66b7042313487b1d76e07e0845 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期二, 28 六月 2022 08:44:38 +0800
Subject: [PATCH] 新增了采购看板、缺料看板、车间看板
---
WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs | 733 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 636 insertions(+), 97 deletions(-)
diff --git a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
index c1ad168..170e0df 100644
--- a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
+++ b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
@@ -1,11 +1,16 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using Pub_Class;
+using SQLHelper;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
+using System.IO;
+using System.Web;
using System.Web.Http;
+using WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�;
using WebAPI.Models;
namespace WebAPI.Controllers
@@ -19,7 +24,13 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
+ DAL.ClsIF_Material_View oMaterHlp = new DAL.ClsIF_Material_View();
+ public DAL.ClsGy_Process_View oProcHlp = new DAL.ClsGy_Process_View();
+ DAL.ClsGy_WorkCenter_View oCenHlp = new DAL.ClsGy_WorkCenter_View();
+ Gy_RoutingBill_temporary omdelMian = new Gy_RoutingBill_temporary();
+ public string BillType = "3301";
+ #region 宸ヨ壓璺嚎 鍒楄〃
/// <summary>
/// 杩斿洖宸ヨ壓璺嚎鍒楄〃
///鍙傛暟锛歴tring sql銆�
@@ -68,6 +79,9 @@
}
}
+ #endregion
+
+ #region 宸ヨ壓璺嚎 鏂板
/// <summary>
/// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
///鍙傛暟锛歴tring sql銆�
@@ -104,15 +118,29 @@
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("Gy_RoutingBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愮紪杈�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
msg2 = "[" + msg2.ToString() + "]";
List<Gy_RoutingBill> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_RoutingBill>>(msg2);
- string BillType = "3301";
+
long HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
string HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
DateTime HDate = mainList[0].HDate;//鏃ユ湡
- int HYear = 2021;
+ int HYear = DateTime.Now.Year;
double HPeriod = 1;
string HRemark = mainList[0].HRemark;//澶囨敞
string HMaker = mainList[0].HMaker;//鍒跺崟浜�
@@ -134,24 +162,48 @@
double HStdSourceQty = mainList[0].HStdSourceQty;//鏍囧噯璧勬簮鏁�
double HAddSourceRate = mainList[0].HAddSourceRate;//鍔犺祫婧愬閲�
double HDelSourceRate = mainList[0].HDelSourceRate;//鍑忚祫婧愬噺閲�
+ int HPRDORGID = mainList[0].HPRDORGID; //鐢熶骇缁勭粐
+ int HOrgID = mainList[0].HOrgID; //缁勭粐
+ string HPicNumVer = mainList[0].HPicNumVer;//鍥惧彿鐗堟湰
+ string HPicNumAssemble = mainList[0].HPicNumAssemble;//鎬昏鍥惧彿
+ string HMaterTexture = mainList[0].HMaterTexture;//鏉愯川
+ string HProductNum = mainList[0].HProductNum;//鎴愬搧缂栧彿
+ string HVerNum = mainList[0].HVerNum;//鐗堟湰
- //涓昏〃
- oCN.RunProc("Insert Into Gy_RoutingBillMain " +
- "(HBillType,HInterID,HBillNo,HDate" +
- ",HYear,HPeriod,HRemark,HMaker,Hmakedate,HMaterID,HName,HMaterTypeID" +
- ",HRoutingGroupID,HUnitID,HMaterNumber,HUnitNumber,HStandard" +
- ",HMainGroupID,HMainProcID,HMainCenterID,HMainTimeUnit,HMainUnitTime,HMainWorkQty" +
- ",HMainPrice,HStdSourceQty,HAddSourceRate,HDelSourceRate" +
- ") " +
- " values('" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
- "," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()," + HMaterID + ",'" + HName + "'," + HMaterTypeID +
- "," + HRoutingGroupID + "," + HUnitID + ",'" + HMaterNumber + "','" + HUnitNumber + "'," + Convert.ToString(HStandard ? 1 : 0) +
- "," + HMainGroupID + "," + HMainProcID + "," + HMainCenterID + ",'" + HMainTimeUnit + "'," + HMainUnitTime + "," + HMainWorkQty +
- "," + HMainPrice + "," + HStdSourceQty + "," + HAddSourceRate + "," + HDelSourceRate +
- ") ");
+ if (OperationType == 1)//鏂板
+ {
+ //涓昏〃
+ oCN.RunProc("Insert Into Gy_RoutingBillMain " +
+ "(HBillType,HInterID,HBillNo,HDate" +
+ ",HYear,HPeriod,HRemark,HMaker,Hmakedate,HMaterID,HName,HMaterTypeID" +
+ ",HRoutingGroupID,HUnitID,HMaterNumber,HUnitNumber,HStandard" +
+ ",HMainGroupID,HMainProcID,HMainCenterID,HMainTimeUnit,HMainUnitTime,HMainWorkQty" +
+ ",HMainPrice,HStdSourceQty,HAddSourceRate,HPRDORGID,HDelSourceRate" +
+ ",HPicNumVer,HPicNumAssemble,HMaterTexture,HProductNum,HVerNum,HOrgID) " + " values('" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
+ "," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()," + HMaterID + ",'" + HName + "'," + HMaterTypeID +
+ "," + HRoutingGroupID + "," + HUnitID + ",'" + HMaterNumber + "','" + HUnitNumber + "'," + Convert.ToString(HStandard ? 1 : 0) +
+ "," + HMainGroupID + "," + HMainProcID + "," + HMainCenterID + ",'" + HMainTimeUnit + "'," + HMainUnitTime + "," + HMainWorkQty +
+ "," + HMainPrice + "," + HStdSourceQty + "," + HAddSourceRate + "," + HPRDORGID + "," + HDelSourceRate +
+ ",'"+ HPicNumVer + "','" + HPicNumAssemble + "','" + HMaterTexture + "','" + HProductNum + "','" + HVerNum + "',"+ HOrgID + ") ");
+ }
+ else if (OperationType == 3)
+ { //淇敼
+ oCN.RunProc("update Gy_RoutingBillMain set " +
+ "HDate='" + HDate +
+ "',HYear='" + HYear + "',HPeriod='" + HPeriod + "',HRemark='" + HRemark + "',HMaker='" + HMaker +
+ "',Hmakedate=getdate(),HMaterID='" + HMaterID + "',HName='" + HName + "',HMaterTypeID='" + HMaterTypeID +
+ "',HRoutingGroupID='" + HRoutingGroupID + "',HUnitID='" + HUnitID + "',HMaterNumber='" + HMaterNumber + "',HUnitNumber='" + HUnitNumber +
+ "',HStandard='" + Convert.ToString(HStandard ? 1 : 0) + "',HMainGroupID='" + HMainGroupID + "',HMainProcID='" + HMainProcID + "',HMainCenterID='" + HMainCenterID +
+ "',HMainTimeUnit='" + HMainTimeUnit + "',HMainUnitTime='" + HMainUnitTime + "',HMainWorkQty='" + HMainWorkQty + "',HMainPrice='" + HMainPrice +
+ "',HStdSourceQty='" + HStdSourceQty + "',HAddSourceRate='" + HAddSourceRate + "',HDelSourceRate='" + HDelSourceRate +
+ "',HPicNumVer='" + HPicNumVer + "',HPicNumAssemble='" + HPicNumAssemble + "',HMaterTexture='" + HMaterTexture + "'" +
+ ",HProductNum='" + HProductNum + "',HVerNum='" + HVerNum + "' where HInterID='" + HInterID + "'");
+ //鍒犻櫎瀛愯〃
+ oCN.RunProc("delete from Gy_RoutingBillSub where HInterID='" + HInterID + "' and HEntryID='" + hentryid + "'");
+ }
//淇濆瓨瀛愯〃
- objJsonResult = AddBillSub(msg3, HInterID);
+ objJsonResult = AddBillSub(msg3, HInterID, hentryid);
if (objJsonResult.code == "0")
{
objJsonResult.code = "0";
@@ -163,23 +215,28 @@
oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID); //璁剧疆榛樿宸ヨ壓璺嚎
//鍒ゆ柇鏄惁閲嶅宸ュ簭鍙�
ds = oCN.RunProcReturn("exec h_p_Gy_RoutingCtrl " + HInterID, "h_p_Gy_RoutingCtrl");
- if (ds == null || ds.Tables[0].Rows.Count == 0)
+
+ if (OperationType == 1)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍒ゆ柇閲嶅宸ュ簭鍙峰け璐ワ紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- if (ClsPub.isStrNull(ds.Tables[0].Rows[0][0]) == "2")
+
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = ClsPub.isStrNull(ds.Tables[0].Rows[0][1]);
+ objJsonResult.Message = "鍒ゆ柇閲嶅宸ュ簭鍙峰け璐ワ紒";
objJsonResult.data = null;
return objJsonResult;
+ }
+ else
+ {
+ if (ClsPub.isStrNull(ds.Tables[0].Rows[0][0]) == "2")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = ClsPub.isStrNull(ds.Tables[0].Rows[0][1]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
}
objJsonResult.code = "1";
@@ -198,11 +255,14 @@
}
}
- public json AddBillSub(string msg3,long HInterID) {
- List<Gy_RoutingBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_RoutingBillSub>>(msg3);
- for (int i=0;i< subList.ToArray().Length;i++)
+ public json AddBillSub(string msg3, long HInterID, int hentryid)
+ {
+ List<Gy_RoutingBillSub> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_RoutingBillSub>>(msg3);
+ int i = 0;
+ foreach (Gy_RoutingBillSub oSub in DetailColl)
{
- if (subList[i].HWorkQty <= 0)
+ i++;
+ if (oSub.HWorkQty <= 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -210,72 +270,34 @@
objJsonResult.data = null;
return objJsonResult;
}
- long HCenterID = 0;//宸ヤ綔涓績ID
- string HTimeUnit = "";//鏃堕棿鍗曚綅
- double HUnitTime = 0;//杩愯鏃堕棿
- double HReadyTime = 0;//鍑嗗鏃堕棿
- double HQueueTime = 0;//鎺掗槦鏃堕棿
- double HMoveTime = 0;//杞Щ鏃堕棿
- string HCloseMan = "";//鍏抽棴浜�
- bool HCloseType = false;//
- string HProcType = "";//宸ュ簭绫诲瀷
- bool HNextProcFlag = false;//涓嬮亾娴佽浆宸ュ簭
- bool HFlowProc = false;//娴佽浆宸ュ簭
- double HFixPrice = 0;//鐝骇瀹氶
- double HProcPrice = 0;//宸ュ簭宸ヤ环
- double HBadPrice = 0;//涓嶅悎鏍煎崟浠�
- double HWasterPrice = 0;//鎶ュ簾鍗曚环
- bool HStdFlag = false;//鏍囧噯瀹氶
- double HBeginDayQty = 0;//寮�宸ヤ綑閲忥紙澶╂暟锛�
- double HBeginFixQty = 0;//寮�宸ヤ綑閲忥紙鍥烘暟锛�
- long HSourceInterID = 0;//婧愬崟涓诲唴鐮�
- long HSourceEntryID = 0;//婧愬崟瀛愬唴鐮�
- string HSourceBillNo = "";//婧愬崟鍗曞彿
- string HSourceBillType = "";//婧愬崟绫诲瀷
- double HRelationQty = 0;//鍏宠仈鏁伴噺
- double HRelationMoney = 0;//鍏宠仈閲戦
- bool HAutoTrunFlag = false;//鑷姩绉昏浆
- double HFixWorkDays = 0;//涓婇亾鍥哄畾澶╂暟
- double HTrunWorkDays = 0;//涓婇亾寰幆鍛ㄦ湡
- double HReadyTimes = 0;//鏈亾鍑嗗鏃堕棿
- double HICMOReadyTimes = 0;//鎹㈠崟鍑嗗鏃堕棿
- double HSubStdEmpQty = 0;//鏍囧噯浜烘暟
- double HSubCanUseSourceQty = 0;//鍙搷浣滆澶囨暟
- long HProcID_S = 0;//宸ユID
- long HCenterID_S = 0;//浜х嚎涓績ID
- double HWorkQty_S = 0;//浜х嚎浜ц兘
- double HSubStdEmpQty_S = 0;//浜х嚎浜烘暟
- string HMouldNo = "";//妯″叿缂栧彿
- double HChangeMould = 0;//鎹㈡ā鏃堕棿/鎹㈠垁鏃堕棿
- string HPackStd = "";//鍛ㄨ浆绠辨爣鍑�
- string HPack = "";//鍛ㄨ浆绠�
- string HPutArea = "";//鏆傛斁鍖�
- double HMyWorkDays = 0;//鐢熶骇鍛ㄦ湡
- double HMyFixWorkDays = 0;//鍥哄畾鐢熶骇澶╂暟
oCN.RunProc("Insert into Gy_RoutingBillSub " +
- "(HInterID,HEntryID,HProcID,HProcNO,HSupID,HSupFlag" +
- ",HWorkQty,HCenterID,HTimeUnit,HUnitTime" +
- ",HReadyTime,HQueueTime,HMoveTime" +
- ",HCloseMan,HCloseType,HRemark,HProcType,HNextProcFlag,HFlowProc" +
- ",HFixPrice,HProcPrice,HBadPrice,HWasterPrice,HStdFlag,HBeginDayQty,HBeginFixQty" +
- ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HAutoTrunFlag" +
- ",HFixWorkDays,HTrunWorkDays,HReadyTimes,HICMOReadyTimes,HSubStdEmpQty,HSubCanUseSourceQty" +
- ",HProcID_S,HCenterID_S,HWorkQty_S,HSubStdEmpQty_S,HMouldNo,HChangeMould" +
- ",HPackStd,HPack,HPutArea,HMyWorkDays,HMyFixWorkDays,HPassRate" +
- ") values("
- + HInterID + "," + i + "," + subList[i].HProcID + "," + subList[i].HProcNo + "," + subList[i].HSupID + "," + Convert.ToString(subList[i].HSupFlag ? 1 : 0) + "" +
- "," + subList[i].HWorkQty + "," + HCenterID + ",'" + HTimeUnit + "'," + HUnitTime +
- "," + HReadyTime + "," + HQueueTime + "," + HMoveTime +
- ",'" + HCloseMan + "'," + Convert.ToString(HCloseType ? 1 : 0) + ",'" + subList[i].HRemark + "','" + HProcType + "'," + Convert.ToString(HNextProcFlag ? 1 : 0) + "," + Convert.ToString(HFlowProc ? 1 : 0) +
- "," + HFixPrice + "," + HProcPrice + "," + HBadPrice + "," + HWasterPrice + "," + Convert.ToString(HStdFlag ? 1 : 0) + "," + HBeginDayQty + "," + HBeginFixQty +
- "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "'," + HRelationQty + "," + HRelationMoney + "," + Convert.ToString(HAutoTrunFlag ? 1 : 0) +
- "," + HFixWorkDays + "," + HTrunWorkDays + "," + HReadyTimes + "," + HICMOReadyTimes + "," + HSubStdEmpQty + "," + HSubCanUseSourceQty +
- "," + HProcID_S + "," + HCenterID_S + "," + HWorkQty_S + ", " + HSubStdEmpQty_S + ",'" + HMouldNo + "'," + HChangeMould +
- ",'" + HPackStd + "','" + HPack + "','" + HPutArea + "'," + HMyWorkDays + "," + HMyFixWorkDays + "," + subList[i].HPassRate +
- ") ");
+ "(HInterID,HEntryID,HProcID,HProcNO,HSupID,HSupFlag" +
+ ",HWorkQty,HCenterID,HTimeUnit,HUnitTime" +
+ ",HReadyTime,HQueueTime,HMoveTime" +
+ ",HCloseMan,HCloseType,HRemark,HProcType,HNextProcFlag,HFlowProc" +
+ ",HFixPrice,HProcPrice,HBadPrice,HWasterPrice,HStdFlag,HBeginDayQty,HBeginFixQty" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HAutoTrunFlag" +
+ ",HFixWorkDays,HTrunWorkDays,HReadyTimes,HICMOReadyTimes,HSubStdEmpQty,HSubCanUseSourceQty" +
+ ",HProcID_S,HCenterID_S,HWorkQty_S,HSubStdEmpQty_S,HMouldNo,HChangeMould" +
+ ",HPackStd,HPack,HPutArea,HMyWorkDays,HMyFixWorkDays,HPassRate" +
+ ",HTechnologyParameter,HPicNum,HProcCheckNote" +
+ ",HOverRate,HProcWorkNum" +
+ ") values("
+ + HInterID + "," + (hentryid==-1?i: hentryid) + "," + oSub.HProcID.ToString() + ",'" + (hentryid == -1 ? i : hentryid) + "'," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "" +
+ "," + oSub.HWorkQty.ToString() + "," + oSub.HCenterID.ToString() + ",'" + oSub.HTimeUnit.ToString() + "'," + oSub.HUnitTime.ToString() +
+ "," + oSub.HReadyTime.ToString() + "," + oSub.HQueueTime.ToString() + "," + oSub.HMoveTime.ToString() +
+ ",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "','" + oSub.HProcType + "'," + Convert.ToString(oSub.HNextProcFlag ? 1 : 0) + "," + Convert.ToString(oSub.HFlowProc ? 1 : 0) +
+ "," + oSub.HFixPrice.ToString() + "," + oSub.HProcPrice.ToString() + "," + oSub.HBadPrice.ToString() + "," + oSub.HWasterPrice.ToString() + "," + Convert.ToString(oSub.HStdFlag ? 1 : 0) + "," + oSub.HBeginDayQty.ToString() + "," + oSub.HBeginFixQty.ToString() +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + "," + Convert.ToString(oSub.HAutoTrunFlag ? 1 : 0) +
+ "," + oSub.HFixWorkDays.ToString() + "," + oSub.HTrunWorkDays.ToString() + "," + oSub.HReadyTimes.ToString() + "," + oSub.HICMOReadyTimes.ToString() + "," + oSub.HSubStdEmpQty.ToString() + "," + oSub.HSubCanUseSourceQty.ToString() +
+ "," + oSub.HProcID_S.ToString() + "," + oSub.HCenterID_S.ToString() + "," + oSub.HWorkQty_S.ToString() + ", " + oSub.HSubStdEmpQty_S.ToString() + ",'" + oSub.HMouldNo + "'," + oSub.HChangeMould.ToString() +
+ ",'" + oSub.HPackStd + "','" + oSub.HPack + "','" + oSub.HPutArea + "'," + oSub.HMyWorkDays.ToString() + "," + oSub.HMyFixWorkDays.ToString() + "," + oSub.HPassRate.ToString() +
+ ",'" + oSub.HTechnologyParameter.ToString() + "','" + oSub.HPicNum.ToString() + "','" + oSub.HProcCheckNote.ToString() +
+ "', " + oSub.HOverRate.ToString() + ",'" + oSub.HProcWorkNum.ToString() + "'" +
+ ") ");
}
-
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = null;
@@ -283,6 +305,523 @@
return objJsonResult;
}
- //
+ #endregion
+
+ #region 宸ヨ壓璺嚎 鏂囦欢涓婁紶
+ [Route("Gy_RoutingBill/Gy_RoutingBillimport")]
+ [HttpPost]
+ public object Gy_RoutingBillimport()
+ {
+ try
+ {
+ var WorkBookName = HttpContext.Current.Request["WorkBookName"];
+ DBUtility.ClsPub.HOrgID = long.Parse(HttpContext.Current.Request["HOrgID"]);
+ //鑾峰彇鏂囦欢鍚嶇О
+ var file = HttpContext.Current.Request.Files[0];
+ //鑾峰彇鏂囦欢鐗╃悊璺緞
+ string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
+ //淇濆瓨鏂囦欢
+ file.SaveAs(ExcelPath);
+
+ NpoiHelper np = new NpoiHelper();
+ DataSet ExcelDs = np.ReadExcel(ExcelPath, 1,2, WorkBookName);
+
+ //鍒犻櫎鏂囦欢
+ File.Delete(ExcelPath);
+
+ //鍒涘缓涓存椂琛�
+ DataTable tb2 = new DataTable("dt2");
+
+ //娣诲姞鍒楀悕
+ for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
+ {
+ tb2.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
+ }
+
+ //娣诲姞鏁版嵁
+ for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
+ {
+ DataRow row = tb2.NewRow();
+ for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
+ {
+ row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
+ }
+ tb2.Rows.Add(row);
+ }
+
+
+ var error = "";
+
+ //鏌ヨ宸ヨ壓璺嚎娌℃湁鐨勫垪
+ if (!tb2.Columns.Contains("浜у搧浠ｇ爜"))
+ error += "娌℃湁鎵惧埌銆愪骇鍝佷唬鐮併�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("宸ュ簭"))
+ error += "娌℃湁鎵惧埌銆愬伐搴忋�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("宸ヤ綔涓績"))
+ error += "娌℃湁鎵惧埌銆愬伐浣滀腑蹇冦�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鍔犲伐鏁伴噺"))
+ error += "娌℃湁鎵惧埌銆愬姞宸ユ暟閲忋�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鏈亾寮�宸ヤ綑閲�"))
+ error += "娌℃湁鎵惧埌銆愭湰閬撳紑宸ヤ綑閲忋�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鏈亾鍥哄畾寮�宸ュぉ鏁�"))
+ error += "娌℃湁鎵惧埌銆愭湰閬撳浐瀹氬紑宸ュぉ鏁般�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鐝骇瀹氶"))
+ error += "娌℃湁鎵惧埌銆愮彮浜у畾棰濄�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("宸ュ簭宸ヤ环"))
+ error += "娌℃湁鎵惧埌銆愬伐搴忓伐浠枫�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("宸ュ簭搴忓彿"))
+ error += "娌℃湁鎵惧埌銆愬伐搴忓簭鍙枫�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("宸ヨ壓鍙傛暟"))
+ error += "娌℃湁鎵惧埌銆愬伐鑹哄弬鏁般�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鍥剧焊缂栧彿"))
+ error += "娌℃湁鎵惧埌銆愬浘绾哥紪鍙枫�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鏈伐搴忕‘璁よ褰�"))
+ error += "娌℃湁鎵惧埌銆愭湰宸ュ簭纭璁板綍銆戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鍥惧彿鐗堟湰"))
+ error += "娌℃湁鎵惧埌銆愬浘鍙风増鏈�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鎬昏鍥惧彿"))
+ error += "娌℃湁鎵惧埌銆愭�昏鍥惧彿銆戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鏉愯川"))
+ error += "娌℃湁鎵惧埌銆愭潗璐ㄣ�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鎴愬搧缂栧彿"))
+ error += "娌℃湁鎵惧埌銆愭垚鍝佺紪鍙枫�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鐗堟湰"))
+ error += "娌℃湁鎵惧埌銆愮増鏈�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("妯″叿缂栧彿"))
+ error += "娌℃湁鎵惧埌銆愭ā鍏风紪鍙枫�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("绋嬪簭鍙�"))
+ error += "娌℃湁鎵惧埌銆愮▼搴忓彿銆戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鑹巼"))
+ error += "娌℃湁鎵惧埌銆愯壇鐜囥�戠殑鏍囬";
+
+ if (error.Length > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = $"Excel妯℃澘瀛樺湪閿欒,{error}\r\n" ;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult = (json)Checkdata(tb2);
+ if (objJsonResult.code == "0")
+ {
+ return objJsonResult;
+ }
+
+ string hnumber = "";
+ if (tb2.Rows.Count > 0)
+ {
+ hnumber = DBUtility.ClsPub.isStrNull(tb2.Rows[0]["浜у搧浠ｇ爜"].ToString());
+ }
+
+ for (int i = 0; i <= tb2.Rows.Count - 1; i++)
+ {
+ string sHNumber = "";
+ if (DBUtility.ClsPub.isStrNull(tb2.Rows[i]["浜у搧浠ｇ爜"].ToString()) != "")
+ {
+ //
+ sHNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["浜у搧浠ｇ爜"].ToString());
+ //瀹℃牳浠ｇ爜鏄惁鍚堢悊
+ if (!DBUtility.ClsPub.AllowNumber(sHNumber))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鐗╂枡浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (hnumber == DBUtility.ClsPub.isStrNull(tb2.Rows[i]["浜у搧浠ｇ爜"].ToString()))
+ {
+ //寰楀埌鐗╂枡鍐呯爜
+ if (!oMaterHlp.GetInfoByNumber(sHNumber))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + (i+1).ToString() + "琛�," + sHNumber + "娌℃湁鎵惧埌瀵瑰簲鐨勭墿鏂欙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ hnumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["浜у搧浠ｇ爜"].ToString());
+ sHNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["浜у搧浠ｇ爜"].ToString());
+
+ //瀹℃牳浠ｇ爜鏄惁鍚堢悊
+ if (!DBUtility.ClsPub.AllowNumber(sHNumber))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鐗╂枡浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //寰楀埌鐗╂枡鍐呯爜
+ if (!oMaterHlp.GetInfoByNumber(sHNumber))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + (i + 1).ToString() + "琛�," + sHNumber + "娌℃湁鎵惧埌瀵瑰簲鐨勭墿鏂欙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + (i + 1).ToString() + "琛�,娌℃湁鎵惧埌瀵瑰簲鐨勭墿鏂欙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = error;
+ objJsonResult.data = tb2;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ //妫�鏌ョ墿鏂�
+ private object Checkdata(DataTable dt)
+ {
+ bool b = false;
+ string sErrMsg = "";
+ string sMsg = "";
+ for (int i = 0; i <= dt.Rows.Count - 1; i++)
+ {
+ string sHNumber = "";
+ string sHNamePoc = "";
+ string sHNumberCen = "";
+ Single sWorkQty = 0;
+ Single sHPassRate = 0;
+
+ //
+ sHNumber = DBUtility.ClsPub.isStrNull(dt.Rows[i]["浜у搧浠ｇ爜"].ToString());
+ sHNumberCen = DBUtility.ClsPub.isStrNull(dt.Rows[i]["宸ヤ綔涓績"].ToString());
+ sHNamePoc = DBUtility.ClsPub.isStrNull(dt.Rows[i]["宸ュ簭"].ToString());
+ sWorkQty = DBUtility.ClsPub.isSingle(dt.Rows[i]["鍔犲伐鏁伴噺"].ToString());
+ sHPassRate = DBUtility.ClsPub.isSingle(dt.Rows[i]["鑹巼"].ToString());
+ if (sHNumber != "")
+ {
+ //
+ int index = i + 1;
+ //鍔犲伐鏁伴噺涓嶈兘灏忎簬绛変簬闆�
+ if (sWorkQty <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + index + "琛屽姞宸ユ暟閲忎笉鑳藉皬浜庣瓑浜庨浂锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鑹巼涓嶈兘灏忎簬绛変簬闆�
+ if (sHPassRate <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + index + "琛岃壇鐜囦笉鑳藉皬浜庣瓑浜庨浂锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //瀹℃牳浠ｇ爜鏄惁鍚堢悊
+ if (!DBUtility.ClsPub.AllowNumber(sHNumber))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鐗╂枡浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //寰楀埌鐗╂枡鍐呯爜
+ int j = i + 2;
+ if (!oMaterHlp.GetInfoByNumber(sHNumber))
+ {
+ sMsg = "[" + sHNumber + "]鐗╂枡涓嶅瓨鍦�";
+ if (sErrMsg.Contains(sMsg) == false)
+ {
+ sErrMsg = sErrMsg + "[" + sHNumber + "]鐗╂枡涓嶅瓨鍦╘r\n";
+ }
+ b = true;
+ }
+ //寰楀埌宸ュ簭鍐呯爜
+ if (!oProcHlp.GetInfoByName(sHNamePoc))
+ {
+ sMsg = "[" + sHNamePoc + "]宸ュ簭涓嶅瓨鍦�";
+ if (sErrMsg.Contains(sMsg) == false)
+ {
+ sErrMsg = sErrMsg + "[" + sHNamePoc + "]宸ュ簭涓嶅瓨鍦╘r\n";
+ }
+ b = true;
+ }
+
+ //寰楀埌宸ヤ綔涓績鍐呯爜
+ if (!oCenHlp.GetInfoByName(sHNumberCen))
+ {
+ sMsg = "[" + sHNumberCen + "]宸ヤ綔涓績涓嶅瓨鍦�";
+ if (sErrMsg.Contains(sMsg) == false)
+ {
+ sErrMsg = sErrMsg + "[" + sHNumberCen + "]宸ヤ綔涓績涓嶅瓨鍦╘r\n";
+ }
+ b = true;
+
+ }
+
+ }
+ }
+ if (b == true)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = sErrMsg;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = sErrMsg;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+ #endregion
+
+ #region 宸ヨ壓璺嚎 瀵煎叆(淇濆瓨)
+ //涓存椂瀛楁
+ public class Gy_RoutingBill_temporary
+ {
+ public string HYear;
+ public string HPeriod;
+ public string DataAppend;
+ public string HOrgID;
+ }
+
+ [Route("Gy_RoutingBill/Gy_RoutingBill_btnSave")]
+ [HttpPost]
+ public object Gy_RoutingBill_btnSave([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ oCN.BeginTran();
+ //淇濆瓨涓昏〃
+ objJsonResult = RoutAddBillMain(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 RoutAddBillMain(string msg1)
+ {
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ string user = sArray[2].ToString();
+
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //琛ㄥご瀛楁
+ omdelMian = Newtonsoft.Json.JsonConvert.DeserializeObject<Gy_RoutingBill_temporary>(msg2);
+
+ //JSON搴忓垪鍖栬浆鎹㈠瓧鍏搁泦鍚�
+ List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
+ List<object> jb = JsonConvert.DeserializeObject<List<object>>(msg3);
+ foreach (JObject item in jb)
+ {
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ foreach (var itm in item.Properties())
+ {
+ dic.Add(itm.Name, itm.Value.ToString());
+ }
+ list.Add(dic);
+ }
+
+ var hnumber = "";
+ var HBillNo = "";
+ long HInterID = 0;
+ for (int i = 0; i < list.Count; i++)
+ {
+ //鑾峰彇鐗╂枡鏁版嵁
+ ds = oCN.RunProcReturn("select * from h_v_IF_Material Where HNumber=" + list[i]["浜у搧浠ｇ爜"].ToString() + " and HUSEORGID=" + omdelMian.HOrgID, "h_v_IF_Material");
+ var HMaterNumber = list[i]["浜у搧浠ｇ爜"].ToString();
+ var HMaterID = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ var Hunitid = ds.Tables[0].Rows[0]["鐗╂枡浠ｇ爜"].ToString();
+ var HUnitNumber = ds.Tables[0].Rows[0]["鐗╂枡浠ｇ爜"].ToString();
+
+ //鑾峰彇宸ュ簭
+ ds = oCN.RunProcReturn("select * from Gy_Process Where HNumber=" + list[i]["宸ュ簭浠ｇ爜"].ToString(), "Gy_Process");
+ var HProcID = ds.Tables[0].Rows[0]["HItemID"].ToString();
+
+ //鑾峰彇宸ヤ綔涓績
+ ds = oCN.RunProcReturn("select * from Gy_WorkCenter Where HNumber=" + list[i]["宸ヤ綔涓績浠ｇ爜"].ToString(), "Gy_WorkCenter");
+ var HCenterID = ds.Tables[0].Rows[0]["HItemID"].ToString();
+
+ if (hnumber != list[i]["浜у搧浠ｇ爜"].ToString())
+ {
+ hnumber = list[i]["浜у搧浠ｇ爜"].ToString();
+ HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);//鑾峰緱涓�涓柊鐨勫崟鎹彿
+ HInterID = DBUtility.ClsPub.CreateBillID_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo);//鑾峰緱涓�涓柊鐨刬d
+ }
+
+
+ var HName = list[i]["宸ヨ壓璺嚎鍚嶇О"].ToString();
+ var HPicNumVer = list[i]["鍥惧彿鐗堟湰"].ToString();
+ var HPicNumAssemble = list[i]["鎬昏鍥惧彿"].ToString();
+ var HMaterTexture = list[i]["鏉愯川"].ToString();
+ var HProductNum = list[i]["鎴愬搧缂栧彿"].ToString();
+ var HVerNum = list[i]["鐗堟湰"].ToString();
+
+
+ //鑾峰彇渚涘簲鍟�
+ ds = oCN.RunProcReturn("select * from h_v_Gy_SupplierList Where HNumber=" + list[i]["渚涘簲鍟嗕唬鐮�"].ToString(), "h_v_Gy_SupplierList");
+ var HSupID = ds.Tables[0].Rows[0]["HItemID"].ToString();
+
+ var HProcNo = list[i]["宸ュ簭搴忓彿"].ToString();
+ var HTimeUnit = list[i]["鏃堕棿鍗曚綅"].ToString();
+ var hworkqty = list[i]["鍔犲伐鏁伴噺"].ToString();
+ var HFixPrice = list[i]["鐝骇瀹氶"].ToString();
+ var HMainPrice = list[i]["宸ュ簭宸ヤ环"].ToString();
+ var HBadPrice = list[i]["涓嶅悎鏍煎崟浠�"].ToString();
+ var HWasterPrice = list[i]["鎶ュ簾鍗曚环"].ToString();
+ var HBeginFixQty = list[i]["鏈亾鍥哄畾寮�宸ュぉ鏁�"].ToString();
+ var HBeginDayQty = list[i]["鏈亾寮�宸ヤ綑閲�"].ToString();
+ var HFixWorkDays = list[i]["涓婇亾绛夊緟澶╂暟"].ToString();
+ var HTrunWorkDays = list[i]["涓婇亾寰幆鍛ㄦ湡"].ToString();
+ var HAutoTrunFlag = list[i]["鑷姩杞Щ"].ToString();
+ var HSupFlag = list[i]["澶栧崗鏍囪"].ToString();
+ var HTechnologyParameter = list[i]["宸ヨ壓鍙傛暟"].ToString();
+ var HPicNum = list[i]["鍥剧焊缂栧彿"].ToString();
+ var HProcCheckNote = list[i]["鏈伐搴忕‘璁よ褰�"].ToString();
+ var hpassrate = list[i]["鑹巼"].ToString();
+ var hremark = list[i]["澶囨敞"].ToString();
+ var HMouldNo = list[i]["妯″叿缂栧彿"].ToString();
+ var HProcWorkNum = list[i]["绋嬪簭鍙�"].ToString();
+ //鐗╂枡鍒嗙被
+
+
+ }
+
+
+ // //涓昏〃
+ // oCN.RunProc("insert into Sc_WorkBillSortBillMain(HInterID,HBillNo,HYear,HPeriod,HBillType," +
+ // "HBillSubType,HDate,HBillStatus,HMaker,HMakeDate,HICMOBillNo,HOrderType," +
+ // "HICMOEntrySEQ,HWorkShopID,HSourceID, HYX, HEmpID," +
+ // " HMaterID, HMaterName, HMaterModel, HUnitID, HBatchNo," +
+ // " HSeOrderBillQty, HPlanQty, HCompleteQty,HPreparatDate," +
+ // "HMainSourceInterID,HMainSourceEntryID)values" +
+ // $"({HInterID},'{HBillNo}',{DateTime.Now.Year},{DateTime.Now.Month},'{BillType}'," +
+ // $"'{BillType}',GETDATE(),1,'{user}','{HDate}','{HICMOBillNo}','{HOrderType}'," +
+ // $"{(HICMOEntrySEQ == "" ? 0.ToString() : HICMOEntrySEQ)},{(HWorkShopID == "" ? 0.ToString() : HWorkShopID)},{(HSourceID == "" ? 0.ToString() : HSourceID)}, {(HYX == "" ? 0.ToString() : HYX)}, {(HEmpID == "" ? 0.ToString() : HEmpID)}," +
+ // $" {(HMaterID == "" ? 0.ToString() : HMaterID)}, '{HMaterName}', '{HMaterModel}', {(HUnitID == "" ? 0.ToString() : HUnitID)}, '{HBatchNo}'," +
+ // $" {(HSeOrderBillQty == "" ? 0.ToString() : HSeOrderBillQty)}, {(HPlanQty == "" ? 0.ToString() : HPlanQty)}, {(HCompleteQty == "" ? 0.ToString() : HCompleteQty)},getdate()," +
+ // $" {HMainSourceInterID},{HMainSourceEntryID})");
+ //}
+
+
+ // for (int j = 0; j < SumDay; j++)
+ // {
+ // //涓昏〃瀛愯〃閮芥湁鏁版嵁
+ // if (list[i][DateTime.Now.AddDays(j).ToString("yyyy-MM-dd")].ToString() != "")
+ // {
+ // SumCount += 1;
+ // ////淇濆瓨瀛愯〃
+ // objJsonResult = RoutAddBillSub(HInterID == 0 ? list[i]["hmainid"].ToString() : HInterID.ToString()
+ // , HBillNo == "" ? list[i]["鍗曟嵁鍙�"].ToString() : HBillNo
+ // , DateTime.Parse(DateTime.Now.AddDays(j).ToString("yyyy-MM-dd").ToString())
+ // , int.Parse(list[i][DateTime.Now.AddDays(j).ToString("yyyy-MM-dd")].ToString()));
+
+ // if (objJsonResult.count == 1)
+ // {
+ // TrueCount += 1;
+ // }
+ // }
+ // //涓昏〃鏈夋暟鎹� 瀛愯〃鏃犳暟鎹�
+ // if (j == 30 && SumCount == 0 && HInterID != 0 && HBillNo != "")
+ // {
+ // objJsonResult = RoutAddBillSub(HInterID.ToString(), HBillNo, DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd").ToString()), 0);
+ // }
+ // }
+ //}
+
+ //if (TrueCount != SumCount)
+ //{
+ // 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;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.1