From 5b8c86d6c9901a57d5688a16b0d0c569a87acbf9 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期四, 30 九月 2021 15:50:48 +0800
Subject: [PATCH] 完善丸井改制的维修类型+增加雅琪诺扣补项目模块
---
WebAPI/DLL/ClsSc_MouldRepairInBill.cs | 5
WebAPI/Controllers/GZGL/Gy_DuSubsidyItemBillController.cs | 218 ++++++++++++++++++++++++
WebAPI/DLL/ClsSc_MouldRepairChangeBill.cs | 2
WebAPI/ListModels.cs | 12 +
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 192 ++++++++++----------
WebAPI/WebAPI.csproj.user | 2
WebAPI/DLL/ClsSc_MouldRepairOutBill.cs | 5
WebAPI/DLL/ClsGy_DuSubsidyItemBill.cs | 89 +++++++++
WebAPI/WebAPI.csproj | 2
9 files changed, 425 insertions(+), 102 deletions(-)
diff --git a/WebAPI/Controllers/GZGL/Gy_DuSubsidyItemBillController.cs b/WebAPI/Controllers/GZGL/Gy_DuSubsidyItemBillController.cs
new file mode 100644
index 0000000..8163f59
--- /dev/null
+++ b/WebAPI/Controllers/GZGL/Gy_DuSubsidyItemBillController.cs
@@ -0,0 +1,218 @@
+锘縰sing 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.GZGL
+{
+ public class Gy_DuSubsidyItemBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ public DataSet ds = new DataSet();
+ public DLL.ClsGy_DuSubsidyItemBill BillNew0 = new DLL.ClsGy_DuSubsidyItemBill();
+ public DLL.ClsGy_DuSubsidyItemBill BillOld0 = new DLL.ClsGy_DuSubsidyItemBill();
+
+ #region 鎵ｈˉ璧勬枡鍒楄〃鏁版嵁
+ /// <summary>
+ /// 杩斿洖鎵ｈˉ璧勬枡鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_DuSubsidyItemBill/Gy_DuSubsidyItemlist")]
+ [HttpGet]
+ public object Gy_DuSubsidyItemlist(string sWhere)
+ {
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Gy_DuSubsidyItemList " + sWhere, "h_v_Gy_DuSubsidyItemList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Gy_DuSubsidyItemList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_DuSubsidyItemList");
+ }
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ 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;
+ }
+ }
+ #endregion
+
+ #region 鍒犻櫎宸ヨ祫绫诲瀷
+ /// <summary>
+ /// 宸ヨ祫绫诲瀷鍒楄〃鍒犻櫎鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_DuSubsidyItemBill/Delete_Json")]
+ [HttpGet]
+ public object Delete_Json(string HInterID)
+ {
+ //鐢╥d鏌ュ埌璇ュ璞�
+ string sql = "select * from Gy_DuSubsidyItem where HItemID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, "Gy_DuSubsidyItem");
+ if (ds == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "涓嶅瓨鍦ㄦ瀵硅薄锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ //if (ds.Tables[0].Columns[12].ToString()!="鏈娇鐢�")
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "姝ら」鐩凡浣跨敤鎴栬�呮湭妫�娴嬶紝涓嶈兘鍒犻櫎锛佽閲嶆柊妫�娴嬪啀鍒犻櫎锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ //else
+ //{
+ string sql2 = "delete from Gy_DuSubsidyItem where HItemID = " + HInterID;
+ ds = oCN.RunProcReturn(sql2, "Gy_DuSubsidyItem");
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ //}
+ }
+ }
+ #endregion
+
+ #region 鎵ｈˉ璧勬枡淇敼鑾峰彇缁戝畾鏁版嵁
+ /// <summary>
+ /// 鎵ｈˉ璧勬枡鍒楄〃淇敼鎸夐挳鏂规硶
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_DuSubsidyItemBill/xg")]
+ [HttpGet]
+ public object xg(long HID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from Gy_DuSubsidyItem where HItemID=" + HID, "Gy_DuSubsidyItem");
+
+ 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 = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鎵ｈˉ璧勬枡淇濆瓨
+ /// <summary>
+ /// 淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_DuSubsidyItemBill/SaveGetGy_DuSubsidyItemBill")]
+ [HttpPost]
+ public object SaveGetGy_DuSubsidyItemBill([FromBody] JObject oMain)
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+
+ ListModels oListModels = new ListModels();
+
+ try
+ {
+ DLL.ClsGy_DuSubsidyItemBill oBill = new DLL.ClsGy_DuSubsidyItemBill();
+ List<Model.ClsGy_DuSubsidyItem_Model> lsmain = new List<Model.ClsGy_DuSubsidyItem_Model>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Gy_DuSubsidyItemBill(msg2);
+ foreach (Model.ClsGy_DuSubsidyItem_Model oItem in lsmain)
+ {
+ oBill.omodel = oItem;
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.omodel.HItemID == 0)
+ {
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HItemID, 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;
+ }
+ }
+ #endregion
+ }
+}
diff --git a/WebAPI/DLL/ClsGy_DuSubsidyItemBill.cs b/WebAPI/DLL/ClsGy_DuSubsidyItemBill.cs
new file mode 100644
index 0000000..ad0be9c
--- /dev/null
+++ b/WebAPI/DLL/ClsGy_DuSubsidyItemBill.cs
@@ -0,0 +1,89 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.DLL
+{
+ public class ClsGy_DuSubsidyItemBill : DBUtility.ClsXt_BaseBill
+ {
+ public Model.ClsGy_DuSubsidyItem_Model omodel = new Model.ClsGy_DuSubsidyItem_Model();
+
+ public ClsGy_DuSubsidyItemBill()
+ {
+ base.MvarItemKeySub = "";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey = "Gy_DuSubsidyItem";
+ base.MvarReportTitle = "鎵ｈˉ璧勬枡";
+ base.BillType = "";
+ base.HBillSubType = "";
+ }
+
+ //鏂板鍗曟嵁
+ public override bool AddBill(ref string sReturn)
+ {
+ try
+ {
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCn.BeginTran();
+ //涓昏〃
+ oCn.RunProc("Insert Into Gy_DuSubsidyItem " +
+ "(HNumber,HName,HHelpCode,HRemark,HStopflag,HUseFlag,HShortNumber,HParentID,HLevel,HEndFlag,HSno,HType,HCaption,HSQLColumnName,HDataType,HDefaultValue" +
+ ",HLength,HSys,HSearch,HMustSave,HSearchTable,HTable" +
+ ") " +
+ " values('" + omodel.HNumber + "','" + omodel.HName + "','" +
+ omodel.HHelpCode + "','" + omodel.HRemark + "','" + Convert.ToString(omodel.HStopflag ? 1 : 0) + "','鏈娇鐢�','" +
+ omodel.HNumber + "',0,0,0" + "," + omodel.HSno.ToString() + ",'"+ omodel.HType + "','" + omodel.HCaption + "','"+ omodel.HSQLColumnName + "','" +
+ omodel.HDataType + "','" + omodel.HDefaultValue + "',"+ omodel.HLength.ToString() + ",0,'',0,'',''"+
+ ") ");
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+ //淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //
+ oCn.BeginTran();
+ //鏇存柊涓昏〃
+ oCn.RunProc("UpDate Gy_DuSubsidyItem set " +
+ " HNumber='" + omodel.HNumber + "'" + //鍥哄畾璧嬪��===============
+ ",HName='" + omodel.HName + "'" +
+ ",HHelpCode='" + omodel.HHelpCode + "'" +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HStopflag='" + Convert.ToString(omodel.HStopflag ? 1 : 0) + "'" +
+ ",HShortNumber='" + omodel.HNumber + "'" +
+ ",HSno=" + omodel.HSno.ToString() +
+ ",HType='" + omodel.HType + "'" +
+ ",HCaption='" + omodel.HCaption + "'" +
+ ",HSQLColumnName='" + omodel.HSQLColumnName + "'" +
+ ",HDataType='" + omodel.HDataType + "'" +
+ ",HDefaultValue='" + omodel.HDefaultValue + "'" +
+ ",HLength=" + omodel.HLength.ToString() +
+
+ " where HItemID=" + lngBillKey.ToString());
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/DLL/ClsSc_MouldRepairChangeBill.cs b/WebAPI/DLL/ClsSc_MouldRepairChangeBill.cs
index 309b6ce..c7e9544 100644
--- a/WebAPI/DLL/ClsSc_MouldRepairChangeBill.cs
+++ b/WebAPI/DLL/ClsSc_MouldRepairChangeBill.cs
@@ -103,7 +103,7 @@
",HChangeNum=" + omodel.HChangeNum.ToString() +
",HEmpID=" + omodel.HEmpID.ToString() +
",HManagerID=" + omodel.HManagerID.ToString() +
- ",HRepairType='" + omodel.HRepairID + "'" +
+ ",HRepairType='" + omodel.HRepairType + "'" +
",HSupID=" + omodel.HSupID.ToString() +
",HNewMaterID=" + omodel.HNewMaterID.ToString() +
",HNewName='" + omodel.HNewName + "'" +
diff --git a/WebAPI/DLL/ClsSc_MouldRepairInBill.cs b/WebAPI/DLL/ClsSc_MouldRepairInBill.cs
index b27a429..636a046 100644
--- a/WebAPI/DLL/ClsSc_MouldRepairInBill.cs
+++ b/WebAPI/DLL/ClsSc_MouldRepairInBill.cs
@@ -46,12 +46,12 @@
"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
",HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
- ",HKeeperID,HDeptID,HExplanation,HInnerBillNo,HRedBlueFlag" +
+ ",HKeeperID,HDeptID,HExplanation,HInnerBillNo,HRedBlueFlag,HRepairType" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker + "',getdate()" +
", " + omodel.HSupID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HSCWHID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HSecManagerID.ToString() +
- ", " + omodel.HKeeperID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) +
+ ", " + omodel.HKeeperID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) + ",'" + omodel.HRepairType + "'" +
") ");
//鎻掑叆瀛愯〃
@@ -129,6 +129,7 @@
",HDeptID=" + omodel.HDeptID.ToString() +
",HExplanation='" + omodel.HExplanation + "'" +
",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
+ ",HRepairType='" + omodel.HRepairType + "'" +
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
diff --git a/WebAPI/DLL/ClsSc_MouldRepairOutBill.cs b/WebAPI/DLL/ClsSc_MouldRepairOutBill.cs
index 78c1f19..edc8d78 100644
--- a/WebAPI/DLL/ClsSc_MouldRepairOutBill.cs
+++ b/WebAPI/DLL/ClsSc_MouldRepairOutBill.cs
@@ -46,12 +46,12 @@
"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
",HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
- ",HKeeperID,HDeptID,HExplanation,HInnerBillNo,HRedBlueFlag" +
+ ",HKeeperID,HDeptID,HExplanation,HInnerBillNo,HRedBlueFlag,HRepairType" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker + "',getdate()" +
", " + omodel.HSupID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HSCWHID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HSecManagerID.ToString() +
- ", " + omodel.HKeeperID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) +
+ ", " + omodel.HKeeperID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) +",'"+ omodel.HRepairType+"'"+
") ");
//鎻掑叆瀛愯〃
@@ -129,6 +129,7 @@
",HDeptID=" + omodel.HDeptID.ToString() +
",HExplanation='" + omodel.HExplanation + "'" +
",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
+ ",HRepairType='" + omodel.HRepairType + "'" +
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 9ba6d9b..f655ed9 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -644,6 +644,18 @@
}
/// <summary>
+ /// 澶勭悊鏂板鎵ｈˉ璧勬枡璁板綍琛ㄤ富琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_DuSubsidyItem_Model> getObjectByJson_Gy_DuSubsidyItemBill(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_DuSubsidyItem_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_DuSubsidyItem_Model>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
/// 澶勭悊鏂板妯″叿鐐规璁板綍琛ㄤ富琛ㄧ殑json
/// </summary>
/// <param name="jsonString"></param>
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index b81d788..df618b4 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -9,40 +9,40 @@
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:16</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
- <publishTime>02/22/2013 16:43:40</publishTime>
+ <publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.pdb">
- <publishTime>02/22/2013 16:43:40</publishTime>
+ <publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>09/29/2021 15:48:49</publishTime>
+ <publishTime>09/30/2021 15:48:05</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>09/29/2021 15:48:49</publishTime>
+ <publishTime>09/30/2021 15:48:05</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>09/29/2021 15:48:47</publishTime>
+ <publishTime>09/30/2021 15:48:03</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>09/29/2021 15:48:47</publishTime>
+ <publishTime>09/30/2021 15:48:03</publishTime>
</File>
<File Include="bin/Dapper.dll">
- <publishTime>07/22/2016 22:52:40</publishTime>
+ <publishTime>07/22/2016 14:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>09/29/2021 15:48:46</publishTime>
+ <publishTime>09/30/2021 15:47:59</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>09/29/2021 15:48:46</publishTime>
+ <publishTime>09/30/2021 15:47:59</publishTime>
</File>
<File Include="bin/Interop.gregn6Lib.dll">
<publishTime>08/25/2021 10:28:25</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>08/25/2021 20:46:09</publishTime>
+ <publishTime>08/16/2021 17:23:13</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
<publishTime>09/20/2018 19:23:20</publishTime>
@@ -51,49 +51,49 @@
<publishTime>09/20/2018 19:28:34</publishTime>
</File>
<File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
- <publishTime>03/19/2015 01:02:50</publishTime>
+ <publishTime>03/18/2015 17:02:50</publishTime>
</File>
<File Include="bin/Microsoft.CSharp.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/Microsoft.Web.Infrastructure.dll">
- <publishTime>07/25/2012 19:48:56</publishTime>
+ <publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>09/29/2021 15:48:46</publishTime>
+ <publishTime>09/30/2021 15:47:59</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>09/29/2021 15:48:46</publishTime>
+ <publishTime>09/30/2021 15:47:59</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
- <publishTime>08/04/2014 04:33:56</publishTime>
+ <publishTime>08/03/2014 20:33:56</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>09/29/2021 15:48:45</publishTime>
+ <publishTime>09/30/2021 15:47:57</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>09/29/2021 15:48:45</publishTime>
+ <publishTime>09/30/2021 15:47:57</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>09/29/2021 15:48:45</publishTime>
+ <publishTime>09/30/2021 15:47:58</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>09/29/2021 15:48:45</publishTime>
+ <publishTime>09/30/2021 15:47:58</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>09/29/2021 15:48:45</publishTime>
+ <publishTime>09/30/2021 15:47:58</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>09/29/2021 15:48:45</publishTime>
+ <publishTime>09/30/2021 15:47:58</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
- <publishTime>02/16/2015 01:57:08</publishTime>
+ <publishTime>02/15/2015 17:57:08</publishTime>
</File>
<File Include="bin/System.ComponentModel.DataAnnotations.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -117,13 +117,13 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
- <publishTime>08/19/2014 18:03:34</publishTime>
+ <publishTime>08/19/2014 10:03:34</publishTime>
</File>
<File Include="bin/System.Net.Http.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Net.Http.Formatting.dll">
- <publishTime>11/28/2018 21:00:36</publishTime>
+ <publishTime>11/28/2018 13:00:36</publishTime>
</File>
<File Include="bin/System.Runtime.Serialization.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -132,7 +132,7 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Web.Cors.dll">
- <publishTime>11/28/2018 20:58:44</publishTime>
+ <publishTime>11/28/2018 12:58:44</publishTime>
</File>
<File Include="bin/System.Web.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -147,37 +147,37 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Web.Helpers.dll">
- <publishTime>01/28/2015 12:04:30</publishTime>
+ <publishTime>01/28/2015 04:04:30</publishTime>
</File>
<File Include="bin/System.Web.Http.Cors.dll">
- <publishTime>11/28/2018 21:01:26</publishTime>
+ <publishTime>11/28/2018 13:01:26</publishTime>
</File>
<File Include="bin/System.Web.Http.dll">
- <publishTime>11/28/2018 21:01:00</publishTime>
+ <publishTime>11/28/2018 13:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
- <publishTime>01/28/2015 12:02:18</publishTime>
+ <publishTime>01/28/2015 04:02:18</publishTime>
</File>
<File Include="bin/System.Web.Optimization.dll">
- <publishTime>02/11/2014 23:26:04</publishTime>
+ <publishTime>02/11/2014 15:26:04</publishTime>
</File>
<File Include="bin/System.Web.Razor.dll">
- <publishTime>01/28/2015 12:02:32</publishTime>
+ <publishTime>01/28/2015 04:02:32</publishTime>
</File>
<File Include="bin/System.Web.Services.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Web.WebPages.Deployment.dll">
- <publishTime>01/28/2015 12:04:30</publishTime>
+ <publishTime>01/28/2015 04:04:30</publishTime>
</File>
<File Include="bin/System.Web.WebPages.dll">
- <publishTime>01/28/2015 12:04:30</publishTime>
+ <publishTime>01/28/2015 04:04:30</publishTime>
</File>
<File Include="bin/System.Web.WebPages.Razor.dll">
- <publishTime>01/28/2015 12:04:30</publishTime>
+ <publishTime>01/28/2015 04:04:30</publishTime>
</File>
<File Include="bin/System.Xml.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -186,184 +186,184 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
- <publishTime>11/24/2014 19:18:48</publishTime>
+ <publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>09/29/2021 15:48:50</publishTime>
+ <publishTime>09/30/2021 15:48:08</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>09/29/2021 15:48:50</publishTime>
+ <publishTime>09/30/2021 15:48:08</publishTime>
</File>
<File Include="bin/WebGrease.dll">
- <publishTime>07/18/2013 01:03:52</publishTime>
+ <publishTime>07/17/2013 17:03:52</publishTime>
</File>
<File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
- <publishTime>11/29/2018 21:26:02</publishTime>
+ <publishTime>11/29/2018 13:26:02</publishTime>
</File>
<File Include="bin/zh-Hans/System.Web.Http.resources.dll">
- <publishTime>11/29/2018 21:26:30</publishTime>
+ <publishTime>11/29/2018 13:26:30</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:16</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:16</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:16</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:16</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Index.html">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="packages.config">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:16</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>08/25/2021 20:46:11</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/Reference.map">
<publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web.config">
- <publishTime>09/29/2021 15:48:54</publishTime>
+ <publishTime>09/30/2021 15:48:15</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index e4bab99..9b35462 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -318,6 +318,7 @@
<Compile Include="Controllers\CJGL\Cj_StationOutBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationInBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" />
+ <Compile Include="Controllers\GZGL\Gy_DuSubsidyItemBillController.cs" />
<Compile Include="Controllers\GZGL\Gy_WorkPayTypeBillController.cs" />
<Compile Include="Controllers\GZGL\Gy_WorkTypeBillController.cs" />
<Compile Include="Controllers\JHGL\Gy_RoutingBillController.cs" />
@@ -372,6 +373,7 @@
<Compile Include="Dapper\SqlPools.cs" />
<Compile Include="DbUntil\DataFormatUntil.cs" />
<Compile Include="DLL\ClsGy_BadReason_Ctl.cs" />
+ <Compile Include="DLL\ClsGy_DuSubsidyItemBill.cs" />
<Compile Include="DLL\ClsGy_Material_Ctl.cs" />
<Compile Include="DLL\ClsGy_Source_Ctl.cs" />
<Compile Include="DLL\ClsGy_WorkPayTypeBill.cs" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 0cc8b55..16d95e2 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -9,7 +9,7 @@
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\Git浠撳簱\鏅轰簯杩堟�漒椤圭洰\MESWMS\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>false</UseIISExpress>
<Use64BitIISExpress />
--
Gitblit v1.9.1