From 178ef58efdb6e6fa1f3cc44c2b3b5a66d5200096 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 23 一月 2024 09:36:46 +0800
Subject: [PATCH] 1
---
Model/销售管理/ClsXs_SeOrderBillSub.cs | 4
WebAPI/Controllers/CJGL/Cj_SingleStationController.cs | 7
WebAPI/Controllers/CJGL/Sc_ProcExchWorkBackBillController.cs | 142 ++++++++++
DAL/基础资料/公用基础资料/ClsGy_ClassTimePrjGroup_Ctl.cs | 24 +
Model/生产管理/ClsSc_ICMOBillSub.cs | 1
DAL/销售管理/ClsXs_SeOrderBill.cs | 12
WebAPI/Controllers/工资管理/Gy_ClassTimePrjGroupController.cs | 555 ++++++++++++++++++++++++++++++++++++++++++
WebAPI/WebAPI.csproj | 1
WebAPI/Controllers/工资管理/Gy_ClassTimePrjController.cs | 4
WebAPI/Controllers/生产管理/生产任务单/Sc_ICMOBillController.cs | 4
10 files changed, 739 insertions(+), 15 deletions(-)
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_ClassTimePrjGroup_Ctl.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_ClassTimePrjGroup_Ctl.cs"
index 7360d60..c5c2947 100644
--- "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_ClassTimePrjGroup_Ctl.cs"
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_ClassTimePrjGroup_Ctl.cs"
@@ -19,10 +19,15 @@
{
oCn.BeginTran();
oCn.RunProc("Insert into " + MvarItemKey + " " +
- " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
- ",HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HGroupID) " +
+ "(HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+ ",HLevel,HEndFlag,HStopflag,HRemark" +
+ ",HMakeEmp,HMakeTime,HUSEORGID,HCREATEORGID" +
+ ",HDeptID,HGroupID) " +
" Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
- "," + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'," + oModel.HDeptID.ToString() + "," + oModel.HGroupID.ToString() + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ ", " + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'" +
+ ",'" + oModel.HMakeEmp + "',getdate()" + "," + oModel.HUSEORGID.ToString() + "," + oModel.HCREATEORGID.ToString() +
+ ", " + oModel.HDeptID.ToString() + "," + oModel.HGroupID.ToString() +
+ ") ", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCn.Commit();
@@ -45,14 +50,19 @@
" HNumber='" + oModel.HNumber + "'" +
",HName='" + oModel.HName + "'" +
",HShortNumber='" + oModel.HShortNumber + "'" +
- ",HHelpCode='" + oModel.HHelpCode + "'" +
- ",HLevel=" + oModel.HLevel.ToString() +
",HParentID=" + oModel.HParentID.ToString() +
+ ",HLevel=" + oModel.HLevel.ToString() +
",HEndflag=" + Convert.ToString(oModel.HEndFlag ? 1 : 0) +
",HStopflag=" + Convert.ToString(oModel.HStopflag ? 1 : 0) +
+ ",HRemark= '" + oModel.HRemark + "'" +
+ ",HModifyEmp= '" + oModel.HModifyEmp + "'" +
+ ",HModifyTime=getdate()" +
+ ",HUSEORGID=" + oModel.HUSEORGID.ToString() +
+ ",HCREATEORGID=" + oModel.HCREATEORGID.ToString() +
+ //===========================================================
",HDeptID=" + oModel.HDeptID.ToString() +
",HGroupID=" + oModel.HGroupID.ToString() +
- ",HRemark= '" + oModel.HRemark + "' Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ " where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼瀛愰」鐩唬鐮�
oCn.RunProc("exec h_p_Gy_UpdateNumber '" + MvarItemKey + "','" + oModel.HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
//灏嗕笂绾� 涓洪潪鏈骇
@@ -91,7 +101,7 @@
public ClsGy_ClassTimePrjGroup_Ctl()
{
MvarItemKey = "Gy_ClassTimePrjGroup";
- MvarReportTitle = "鏍哥畻鏂瑰紡缁勮缃�";
+ MvarReportTitle = "鏍哥畻鏂瑰紡缁�";
oModel = new Model.ClsGy_ClassTimePrjGroup_Model();
}
}
diff --git "a/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderBill.cs" "b/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderBill.cs"
index 01a2d20..7e1b146 100644
--- "a/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderBill.cs"
+++ "b/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderBill.cs"
@@ -115,7 +115,8 @@
string subSql = "Insert into Xs_SeOrderBillSub" +
"(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HUnitID,HQty,HPrice,HTaxPrice,HMoney" +
- ",HDiscountRate,HRelTaxPrice,HTaxRate,HTaxMoney,HlineTotal,HlineTotalBB,HDate,HOutStockQty,HInvoiceQty,HRemark,HOrderLevID ) " +
+ ",HDiscountRate,HRelTaxPrice,HTaxRate,HTaxMoney,HlineTotal,HlineTotalBB,HDate,HOutStockQty,HInvoiceQty,HRemark,HOrderLevID" +
+ ",HCusMaterNumber,HCusModel,HCusMaterName ) " +
"values(" +
"" + omodel.HInterID +
"," + oSub.HEntryID +
@@ -142,6 +143,9 @@
"," + oSub.HInvoiceQty +
",'" + oSub.HRemark +
"','" + oSub.HOrderLevID +
+ "','" + oSub.HCusMaterNumber +
+ "','" + oSub.HCusModel +
+ "','" + oSub.HCusMaterName +
"')";
oCn.RunProc(subSql);
}
@@ -286,7 +290,8 @@
// ") ");
string subSql = "Insert into Xs_SeOrderBillSub" +
"(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HUnitID,HQty,HPrice,HTaxPrice,HMoney" +
- ",HDiscountRate,HRelTaxPrice,HTaxRate,HTaxMoney,HlineTotal,HlineTotalBB,HDate,HOutStockQty,HInvoiceQty,HRemark,HOrderLevID) " +
+ ",HDiscountRate,HRelTaxPrice,HTaxRate,HTaxMoney,HlineTotal,HlineTotalBB,HDate,HOutStockQty,HInvoiceQty,HRemark,HOrderLevID" +
+ ",HCusMaterNumber,HCusModel,HCusMaterName) " +
"values(" +
"" + omodel.HInterID +
"," + oSub.HEntryID +
@@ -313,6 +318,9 @@
"," + oSub.HInvoiceQty +
",'" + oSub.HRemark +
"','" + oSub.HOrderLevID +
+ "','" + oSub.HCusMaterNumber +
+ "','" + oSub.HCusModel +
+ "','" + oSub.HCusMaterName +
"')";
oCn.RunProc(subSql);
}
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_ICMOBillSub.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_ICMOBillSub.cs"
index a57cb0f..79ac92f 100644
--- "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_ICMOBillSub.cs"
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_ICMOBillSub.cs"
@@ -43,6 +43,7 @@
public string HCusMaterName; //客户物料名称
public string HCusModel; //客户规格型号
+ public string HCusMaterNumber; //客户物料编码
public object HOrderPickRemark { get; set; }
diff --git "a/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderBillSub.cs" "b/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderBillSub.cs"
index 54d61b8..b07b3b5 100644
--- "a/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderBillSub.cs"
+++ "b/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderBillSub.cs"
@@ -23,6 +23,10 @@
public double HInvoiceQty;// dec(18,8) --开票数量（不可编辑） --addnew
public string HRemark;// varchar(200) --备注
+ public string HCusMaterNumber; //客户物料编码
+ public string HCusModel; //客户规格型号
+ public string HCusMaterName; //客户物料名称
+
public Int64 HInterID;
public Int64 HEntryID;
diff --git a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
index 90b0de6..70a5f6d 100644
--- a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
@@ -562,6 +562,13 @@
sMainStr = "[" + sMainStr + "]";
List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(sMainStr);
+
+ ds = oCN.RunProcReturn("select HCenterID from Sc_ProcessExchangeBillSub WITH(NOLOCK) where HInterID=" + list[0].HProcExchInterID + " and HEntryID=" + list[0].HProcExchEntryID, "Sc_ProcessExchangeBillSub");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ list[0].HCenterID = long.Parse(ds.Tables[0].Rows[0]["HCenterID"].ToString());
+ }
+
long HMainInterID = 0;
string BillType = "3791";
string HBillSubType = "3791";
diff --git a/WebAPI/Controllers/CJGL/Sc_ProcExchWorkBackBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcExchWorkBackBillController.cs
index 0a39f2b..f40d94e 100644
--- a/WebAPI/Controllers/CJGL/Sc_ProcExchWorkBackBillController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_ProcExchWorkBackBillController.cs
@@ -653,5 +653,147 @@
}
}
#endregion
+
+ #region 鎺掑崟澧欐煡璇㈠垪琛�
+ [Route("Sc_ProcExchWorkBackBill/SingleRowWallList")]
+ [HttpGet]
+ public object SingleRowWallList(string sWhere, string user)
+ {
+ try
+ {
+ DataTable dt1 = new DataTable("DataSouce");
+ DataTable dt2 = new DataTable("DataColor");
+ List<object> columnNameList = new List<object>();
+
+ string sql = "exec h_p_SingleRowWall "+ sWhere;
+ ds = oCN.RunProcReturn(sql, "DataSouce");
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ dt1.Columns.Add(col.ColumnName);
+ dt2.Columns.Add(col.ColumnName);
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ if (ds.Tables.Count == 2) {
+
+ int[] num2 = new int[ds.Tables[0].Columns.Count];//璁板綍姣忎竴鍒楄幏鍙栨湁鍊肩殑琛屾暟
+
+ for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ int num = 0;//璁板綍娌℃湁鏁版嵁琛岀殑鍒楁暟
+ int[] num3 = new int[ds.Tables[0].Columns.Count];//璁板綍姣忎竴鍒楁病鏈夋暟鎹殑琛屾暟
+
+ DataRow dtrow = dt1.NewRow();
+ for (int j = 0; j < ds.Tables[0].Columns.Count; j++)
+ {
+ int num1 = 0;//璁板綍鏈夊灏戞婊¤冻涓嶄负绌虹殑鏉′欢
+ DataColumn col = ds.Tables[0].Columns[j];
+ for (int k = 0; k < ds.Tables[0].Rows.Count; k++)
+ {
+ DataRow item = ds.Tables[0].Rows[k];
+ if (item[col.ColumnName.ToString()].ToString() != "")
+ {
+ num1 += 1;
+ if (num1 > num2[j])
+ {
+ dtrow[col.ColumnName.ToString()] = item[col.ColumnName.ToString()].ToString();
+ num2[j] += 1;
+ break;
+ }
+ else
+ {
+ num3[j] += 1;
+ }
+ }
+ else
+ {
+ num3[j] += 1;
+ }
+ if (num3[j] == ds.Tables[0].Rows.Count)
+ {
+ num += 1;
+ }
+ }
+ }
+ if (num == ds.Tables[0].Columns.Count)
+ {
+ break;
+ }
+ dt1.Rows.Add(dtrow);
+ }
+
+ int[] nums2 = new int[ds.Tables[1].Columns.Count];//璁板綍姣忎竴鍒楄幏鍙栨湁鍊肩殑琛屾暟
+
+ for (int i = 0; i < ds.Tables[1].Rows.Count; i++)
+ {
+ int num = 0;//璁板綍娌℃湁鏁版嵁琛岀殑鍒楁暟
+ int[] num3 = new int[ds.Tables[1].Columns.Count];//璁板綍姣忎竴鍒楁病鏈夋暟鎹殑琛屾暟
+
+ DataRow row = ds.Tables[1].Rows[i];
+ DataRow dtrow = dt2.NewRow();
+ for (int j = 0; j < ds.Tables[1].Columns.Count; j++)
+ {
+ int num1 = 0;//璁板綍鏈夊灏戞婊¤冻涓嶄负绌虹殑鏉′欢
+ DataColumn col = ds.Tables[1].Columns[j];
+ for (int k = 0; k < ds.Tables[1].Rows.Count; k++)
+ {
+ DataRow item = ds.Tables[1].Rows[k];
+ if (item[col.ColumnName.ToString()].ToString() != "")
+ {
+ num1 += 1;
+ if (num1 > nums2[j])
+ {
+ dtrow[col.ColumnName.ToString()] = item[col.ColumnName.ToString()].ToString();
+ nums2[j] += 1;
+ break;
+ }
+ else
+ {
+ num3[j] += 1;
+ }
+ }
+ else
+ {
+ num3[j] += 1;
+ }
+ if (num3[j] == ds.Tables[0].Rows.Count)
+ {
+ num += 1;
+ }
+ }
+ }
+ if (num == ds.Tables[0].Columns.Count||i==3)
+ {
+ break;
+ }
+ dt2.Rows.Add(dtrow);
+ }
+
+ ds.Tables.Clear();
+ ds.Tables.Add(dt1);
+ ds.Tables.Add(dt2);
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds;
+ 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
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjController.cs"
index df029e6..452f17b 100644
--- "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjController.cs"
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjController.cs"
@@ -450,10 +450,6 @@
return objJsonResult;
}
}
-
-
-
-
}
catch (Exception e)
{
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjGroupController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjGroupController.cs"
new file mode 100644
index 0000000..051b596
--- /dev/null
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_ClassTimePrjGroupController.cs"
@@ -0,0 +1,555 @@
+锘縰sing DBUtility;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers
+{
+ public class Gy_ClassTimePrjGroupController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ const string ModCaption = "鏍哥畻鏂瑰紡缁�";
+ public const string ModRightName = "Gy_ClassTimePrjGroup";
+ public const string ModRightNameAdd = ModRightName + "_Add"; //鏂板
+ public const string ModRightNameEdit = ModRightName + "_Edit"; //缂栬緫
+ public const string ModRightNameCheck = ModRightName + "_Check"; //瀹℃牳
+ public const string ModRightNameClose = ModRightName + "_Stop"; //绂佺敤
+ public const string ModRightNameDelete = ModRightName + "_Delete"; //鍒犻櫎
+ public DataSet ds = new DataSet();
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ DAL.ClsGy_ClassTimePrjGroup_Ctl oClassTimePrj = new DAL.ClsGy_ClassTimePrjGroup_Ctl();
+ DAL.ClsGy_ClassTimePrjGroup_View oClassTimePrjHlp = new DAL.ClsGy_ClassTimePrjGroup_View();
+
+
+ #region 鏍哥畻鏂瑰紡缁勫垪琛�
+ /// <summary>
+ /// 鑾峰彇鏍哥畻鏂瑰紡缁勫垪琛ㄤ俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Gy_ClassTimePrjGroupController/GetGy_ClassTimePrjGroupList_Json")]
+ [HttpGet]
+ public object GetGy_ClassTimePrjGroupList_Json(string sWhere, string HMaker)
+ {
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightName, 1, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //杩斿洖鍒楄〃淇℃伅
+ ds = oCn.RunProcReturn("select * from h_v_Gy_ClassTimePrjGroupList where " + sWhere + " order by " + ModCaption + "浠ｇ爜" , "h_v_Gy_ClassTimePrjGroupList");
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString)); //鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鍒楄〃淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鏍哥畻鏂瑰紡缁勫垹闄�
+ /// <summary>
+ /// 鍒犻櫎鏍哥畻鏂瑰紡缁�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Gy_ClassTimePrjGroupController/GetGy_ClassTimePrjGroup_Delete_Json")]
+ [HttpGet]
+ public object GetGy_ClassTimePrjGroup_Delete_Json(Int64 HItemID, string HMaker)
+ {
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鍒犻櫎鍔熻兘鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鍒ゆ柇瀛樺湪鎬�
+ if (oClassTimePrjHlp.GetInfoByID(HItemID))
+ {
+ //鍒ゆ柇鏄惁瀛樺湪瀛愰」
+ if (oClassTimePrj.HavChildCodes(HItemID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゆ牳绠楁柟寮忕粍瀛樺湪瀛愰」鐩�,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍒犻櫎鏁版嵁
+ if (oClassTimePrj.DeleteByID(HItemID))
+ {
+ //鍐欏叆鏃ュ織
+ DBUtility.ClsPub.Add_Log("", "鍒犻櫎鏍哥畻鏂瑰紡缁勶紝浠ｇ爜锛�" + oClassTimePrjHlp.omodel.HNumber + ",鍚嶇О锛�" + oClassTimePrjHlp.omodel.HName, HMaker);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鏍哥畻鏂瑰紡缁勬垚鍔燂紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎鏍哥畻鏂瑰紡缁勫け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ 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;
+ }
+ }
+ #endregion
+
+ #region 鏍哥畻鏂瑰紡缁勫鏍搞�佸弽瀹℃牳
+ /// <summary>
+ /// 瀹℃牳銆佸弽瀹℃牳鏍哥畻鏂瑰紡缁�
+ /// </summary>
+ /// <param name="HItemID">鍐呯爜</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="HMaker">鎿嶄綔浜�</param>
+ /// <returns></returns>
+ [Route("Gy_ClassTimePrjGroupController/GetGy_ClassTimePrjGroup_Check_Json")]
+ [HttpGet]
+ public object GetGy_ClassTimePrjGroup_Check_Json(Int64 HItemID, int IsAudit, string HMaker)
+ {
+ string sErrMsg = "";
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡瀹℃牳/鍙嶅鏍稿姛鑳芥潈闄�,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ if (oClassTimePrj.CheckByHItemID(HItemID, HMaker, ref sErrMsg))
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鏍哥畻鏂瑰紡缁勬垚鍔燂紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳鏍哥畻鏂瑰紡缁勫け璐ワ紒" + sErrMsg;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ if (oClassTimePrj.AbandonCheckByHItemID(HItemID, HMaker, ref sErrMsg))
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告牳绠楁柟寮忕粍鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍告牳绠楁柟寮忕粍澶辫触锛�" + sErrMsg;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ 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;
+ }
+ }
+ #endregion
+
+ #region 鏍哥畻鏂瑰紡缁勭鐢ㄣ�佸弽绂佺敤
+ /// <summary>
+ /// 绂佺敤銆佸弽绂佺敤鏍哥畻鏂瑰紡缁�
+ /// </summary>
+ /// <param name="HItemID">鍐呯爜</param>
+ /// <param name="IsStop">绂佺敤(0),鍙嶇鐢�(1)</param>
+ /// <param name="HMaker">鎿嶄綔浜�</param>
+ /// <returns></returns>
+ [Route("Gy_ClassTimePrjGroupController/GetGy_ClassTimePrjGroup_Stop_Json")]
+ [HttpGet]
+ public object GetGy_ClassTimePrjGroup_Stop_Json(Int64 HItemID, int IsStop, string HMaker)
+ {
+ string sErrMsg = "";
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameClose, 1, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡绂佺敤/鍙嶇鐢ㄥ姛鑳芥潈闄�,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (IsStop == 0) //绂佺敤鍒ゆ柇
+ {
+ if (oClassTimePrj.StopByHItemID(HItemID, HMaker, ref sErrMsg))
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "绂佺敤鏍哥畻鏂瑰紡缁勬垚鍔燂紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绂佺敤鏍哥畻鏂瑰紡缁勫け璐ワ紒" + sErrMsg;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else if (IsStop == 1) //鍙嶇鐢ㄥ垽鏂�
+ {
+ if (oClassTimePrj.AbandonStopByHItemID(HItemID, HMaker, ref sErrMsg))
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶇鐢ㄦ牳绠楁柟寮忕粍鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶇鐢ㄦ牳绠楁柟寮忕粍澶辫触锛�" + sErrMsg;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ 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;
+ }
+ }
+ #endregion
+
+ #region 鏍哥畻鏂瑰紡缁勪繚瀛�
+ /// <summary>
+ /// 鏍哥畻鏂瑰紡缁勪繚瀛�
+ /// </summary>
+ [Route("Gy_ClassTimePrjGroupController/GetGy_ClassTimePrjGroup_Save_Json")]
+ [HttpPost]
+ public object GetGy_ClassTimePrjGroup_Save_Json([FromBody] JObject oMain)
+ {
+ try
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string HMaker = sArray[1].ToString();
+ string OperationType = sArray[2].ToString(); //鎿嶄綔绫诲瀷锛�1鏂板銆�2缂栬緫锛�
+
+ //鍒ゆ柇鏉冮檺
+ if (OperationType == "1")
+ {
+ //鍒ゆ柇鏂板鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameAdd, 1, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏂板鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ //鍒ゆ柇缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameEdit, 1, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡缂栬緫鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ //鍙嶅簭鍒楀寲
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", "");
+ msg2 = "[" + msg2.ToString() + "]";
+ List<Model.ClsGy_ClassTimePrjGroup_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_ClassTimePrjGroup_Model>>(msg2);
+ oClassTimePrj.oModel.HItemID = list[0].HItemID;
+ oClassTimePrj.oModel.HNumber = list[0].HNumber;
+ oClassTimePrj.oModel.HName = list[0].HName;
+ oClassTimePrj.oModel.HShortNumber = DBUtility.ClsPub.GetShortNumber(list[0].HNumber);
+ oClassTimePrj.oModel.HLevel = DBUtility.ClsPub.GetLevel(list[0].HNumber);
+ oClassTimePrj.oModel.HEndFlag = true;
+ oClassTimePrj.oModel.HStopflag = list[0].HStopflag;
+ oClassTimePrj.oModel.HUseFlag = list[0].HUseFlag;
+ oClassTimePrj.oModel.HRemark = list[0].HRemark;
+ oClassTimePrj.oModel.HMakeEmp = HMaker;
+ oClassTimePrj.oModel.HModifyEmp = HMaker;
+ oClassTimePrj.oModel.HCheckEmp = list[0].HCheckEmp;
+ oClassTimePrj.oModel.HUSEORGID = list[0].HUSEORGID;
+ oClassTimePrj.oModel.HCREATEORGID = list[0].HUSEORGID;
+ //
+ oClassTimePrj.oModel.HDeptID = list[0].HDeptID;
+ oClassTimePrj.oModel.HGroupID = list[0].HGroupID;
+
+ //妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
+ string sParent = DBUtility.ClsPub.GetParentCode(list[0].HNumber);
+ if (sParent.Trim() == "")
+ {
+ oClassTimePrj.oModel.HParentID = 0;
+ }
+ else
+ {
+ ds = oCn.RunProcReturn("select * from " + ModRightName + " where HStopflag=0 and HNumber='" + sParent + "' and HItemID<>" + oClassTimePrj.oModel.HItemID, ModRightName);
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ oClassTimePrj.oModel.HParentID = long.Parse(ds.Tables[0].Rows[0]["HItemID"].ToString());
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //淇濆瓨鍘熶唬鐮�
+
+ DataSet dsOldNumber = oCn.RunProcReturn("select * from " + ModRightName + " where HItemID='" + oClassTimePrj.oModel.HItemID + "'", ModRightName);
+ if (dsOldNumber.Tables[0].Rows.Count > 0)
+ {
+ oClassTimePrj.HOldNumber = DBUtility.ClsPub.isStrNull(dsOldNumber.Tables[0].Rows[0]["HNumber"]);
+ //鏄惁鏂颁唬鐮佹槸鑷繁瀛愰」鐩殑銆�瀛愰」鐩�
+ if (sParent.Length >= oClassTimePrj.HOldNumber.Length)
+ {
+ if (sParent.Substring(0, oClassTimePrj.HOldNumber.ToString().Length) == oClassTimePrj.HOldNumber.Trim())
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏂颁唬鐮佷笉鑳芥槸鑷繁鐨勪笅绾х殑瀛愰」鐩紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ oClassTimePrj.HOldNumber = "";
+ }
+
+ //淇濆瓨鍓嶅垽鏂�
+ //瀹℃牳浠ｇ爜鏄惁鍚堢悊
+ if (!DBUtility.ClsPub.AllowNumber(oClassTimePrj.oModel.HNumber))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鏄惁閲嶅浠ｇ爜
+ if (oClassTimePrj.HavSameNumber(oClassTimePrj.oModel.HItemID, oClassTimePrj.oModel.HNumber))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浠ｇ爜閲嶅锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //淇濆瓨
+ if (OperationType == "1")
+ {
+ //鏂板
+ if (oClassTimePrj.AddNew())
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏂板鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏂板澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if(oClassTimePrj.oModel.HCheckEmp!="")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍革紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //淇敼
+ if (oClassTimePrj.ModifyByID(oClassTimePrj.oModel.HItemID))
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇敼鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇敼澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region 鏄剧ず鏍哥畻鏂瑰紡缁勪俊鎭�
+ /// <summary>
+ /// 鏍规嵁鍩虹璧勬枡ID 鏌ユ壘璁板綍
+ /// </summary>
+ [Route("Gy_ClassTimePrjGroupController/GetGy_ClassTimePrjGroup_Json")]
+ [HttpGet]
+ public object GetGy_ClassTimePrjGroup_Json(Int64 HItemID)
+ {
+ try
+ {
+ ds = oCn.RunProcReturn("select * from h_v_Gy_ClassTimePrjGroupListDetail where HItemID=" + HItemID, "h_v_Gy_ClassTimePrjGroupListDetail");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌璇ユ牳绠楁柟寮忕粍锛岃鍒锋柊鏁版嵁鍚庨噸鏂伴�夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "杩斿洖鏍哥畻鏂瑰紡缁勪俊鎭け璐ワ紒" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ }
+}
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
index 1b8eb10..790ae58 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
@@ -650,14 +650,14 @@
,HMaterID,HUnitID,HRemark,HSourceID,HDeptID,HSTATUS
,HBomID,HEntryCusID,HSTOCKINORGID
,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney
- ,HAuxQty,HAuxUnit,HWidth,HWeight,HColorRemark,HCusMaterName,HCusModel,HOrderPickRemark)
+ ,HAuxQty,HAuxUnit,HWidth,HWeight,HColorRemark,HCusMaterName,HCusModel,HOrderPickRemark,HCusMaterNumber)
values({HInterID},{HEntryID},{(oSub.HQty == null ? 0 : oSub.HQty)}
,'{(oSub.HPlanBeginDate == null ? DateTime.Now.ToString("yyyy-MM-dd") : oSub.HPlanBeginDate.ToString())}','{(oSub.HPlanEndDate == null ? DateTime.Now.AddDays(1).ToString("yyyy-MM-dd") : oSub.HPlanEndDate.ToString())}'
,'{(oSub.HBeginDate == null ? DateTime.Now.ToString("yyyy-MM-dd") : oSub.HBeginDate.ToString())}','{(oSub.HEndDate == null ? DateTime.Now.AddDays(1).ToString("yyyy-MM-dd") : oSub.HEndDate.ToString())}'
,{oSub.HMaterID},{oSub.HUnitID},'{oSub.HRemark}',{oSub.HSourceID},{oSub.HDeptID},{oSub.HSTATUS}
,{oSub.HBomID} ,{oSub.HCusID} ,{oSub.HSTOCKINORGID}
,{oSub.HSourceInterID},{oSub.HSourceEntryID},'{oSub.HSourceBillNo}','{oSub.HSourceBillType}',0,0
- ,{oSub.HAuxQty},{oSub.HAuxUnit},{oSub.HWidth},{oSub.HWeight},'{oSub.HColorRemark}','{oSub.HCusMaterName}','{oSub.HCusModel}','{oSub.HOrderPickRemark}')");
+ ,{oSub.HAuxQty},{oSub.HAuxUnit},{oSub.HWidth},{oSub.HWeight},'{oSub.HColorRemark}','{oSub.HCusMaterName}','{oSub.HCusModel}','{oSub.HOrderPickRemark}','{oSub.HCusMaterNumber}')");
//淇濆瓨鍚庢帶鍒�=========================================
ds = oCN.RunProcReturn("exec h_p_Sc_ICMOBill_AfterSaveCtrl_New " + HInterID, "h_p_Sc_ICMOBill_AfterSaveCtrl_New");
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 8b33756..98a45ec 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -532,6 +532,7 @@
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_CheckItemBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_FastICSchemeController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcCommPriceController.cs" />
+ <Compile Include="Controllers\宸ヨ祫绠＄悊\Gy_ClassTimePrjGroupController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_OutApplyBillController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_OverApplyBillController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_PayMentBillController.cs" />
--
Gitblit v1.9.1