duhe
2024-11-26 838f159c0219270bcb97f2f87406778cada4f550
分布式调入单、分布式调出单:增加字段 项目HProjectID
75个文件已修改
42 ■■■■■ 已修改文件
APSM/bin/Release/APSM.dll 补丁 | 查看 | 原始文档 | blame | 历史
APSM/bin/Release/APSM.pdb 补丁 | 查看 | 原始文档 | blame | 历史
APSM/bin/Release/BLL.dll 补丁 | 查看 | 原始文档 | blame | 历史
APSM/bin/Release/BLL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
APSM/bin/Release/BaseSet.dll 补丁 | 查看 | 原始文档 | blame | 历史
APSM/bin/Release/BaseSet.pdb 补丁 | 查看 | 原始文档 | blame | 历史
APSM/bin/Release/DAL.dll 补丁 | 查看 | 原始文档 | blame | 历史
APSM/bin/Release/DAL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
APSM/bin/Release/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
APSM/bin/Release/Model.pdb 补丁 | 查看 | 原始文档 | blame | 历史
APSM/bin/Release/PlanM.dll 补丁 | 查看 | 原始文档 | blame | 历史
APSM/bin/Release/PlanM.pdb 补丁 | 查看 | 原始文档 | blame | 历史
APSM/bin/Release/WarM.dll 补丁 | 查看 | 原始文档 | blame | 历史
APSM/bin/Release/WarM.pdb 补丁 | 查看 | 原始文档 | blame | 历史
APSM/bin/Release/WorkM.dll 补丁 | 查看 | 原始文档 | blame | 历史
APSM/bin/Release/WorkM.pdb 补丁 | 查看 | 原始文档 | blame | 历史
BLL/bin/Release/BLL.dll 补丁 | 查看 | 原始文档 | blame | 历史
BLL/bin/Release/BLL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
BLL/bin/Release/DAL.dll 补丁 | 查看 | 原始文档 | blame | 历史
BLL/bin/Release/DAL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
BLL/bin/Release/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
BLL/bin/Release/Model.pdb 补丁 | 查看 | 原始文档 | blame | 历史
BaseSet/bin/Release/BLL.dll 补丁 | 查看 | 原始文档 | blame | 历史
BaseSet/bin/Release/BLL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
BaseSet/bin/Release/BaseSet.dll 补丁 | 查看 | 原始文档 | blame | 历史
BaseSet/bin/Release/BaseSet.pdb 补丁 | 查看 | 原始文档 | blame | 历史
BaseSet/bin/Release/DAL.dll 补丁 | 查看 | 原始文档 | blame | 历史
BaseSet/bin/Release/DAL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
BaseSet/bin/Release/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
BaseSet/bin/Release/Model.pdb 补丁 | 查看 | 原始文档 | blame | 历史
DAL/bin/Release/DAL.dll 补丁 | 查看 | 原始文档 | blame | 历史
DAL/bin/Release/DAL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
DAL/bin/Release/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
DAL/bin/Release/Model.pdb 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
Model/bin/Release/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
Model/bin/Release/Model.pdb 补丁 | 查看 | 原始文档 | blame | 历史
Model/obj/Release/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
Model/obj/Release/Model.pdb 补丁 | 查看 | 原始文档 | blame | 历史
Model/仓库管理/ClsKf_StepFoldInBillMain.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/仓库管理/ClsKf_StepFoldOutBillMain.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
PlanM/bin/Release/BLL.dll 补丁 | 查看 | 原始文档 | blame | 历史
PlanM/bin/Release/BLL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
PlanM/bin/Release/DAL.dll 补丁 | 查看 | 原始文档 | blame | 历史
PlanM/bin/Release/DAL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
PlanM/bin/Release/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
PlanM/bin/Release/Model.pdb 补丁 | 查看 | 原始文档 | blame | 历史
PlanM/bin/Release/PlanM.dll 补丁 | 查看 | 原始文档 | blame | 历史
PlanM/bin/Release/PlanM.pdb 补丁 | 查看 | 原始文档 | blame | 历史
SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
WarM/bin/Release/BLL.dll 补丁 | 查看 | 原始文档 | blame | 历史
WarM/bin/Release/BLL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
WarM/bin/Release/DAL.dll 补丁 | 查看 | 原始文档 | blame | 历史
WarM/bin/Release/DAL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
WarM/bin/Release/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
WarM/bin/Release/Model.pdb 补丁 | 查看 | 原始文档 | blame | 历史
WarM/bin/Release/WarM.dll 补丁 | 查看 | 原始文档 | blame | 历史
WarM/bin/Release/WarM.pdb 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/仓存管理/领料发货/Kf_StepFoldOutBillController.cs 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/仓存管理/验收入库/Kf_StepFoldinBillController.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WorkM/bin/Release/BLL.dll 补丁 | 查看 | 原始文档 | blame | 历史
WorkM/bin/Release/BLL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
WorkM/bin/Release/DAL.dll 补丁 | 查看 | 原始文档 | blame | 历史
WorkM/bin/Release/DAL.pdb 补丁 | 查看 | 原始文档 | blame | 历史
WorkM/bin/Release/Model.dll 补丁 | 查看 | 原始文档 | blame | 历史
WorkM/bin/Release/Model.pdb 补丁 | 查看 | 原始文档 | blame | 历史
WorkM/bin/Release/WarM.dll 补丁 | 查看 | 原始文档 | blame | 历史
WorkM/bin/Release/WarM.pdb 补丁 | 查看 | 原始文档 | blame | 历史
WorkM/bin/Release/WorkM.dll 补丁 | 查看 | 原始文档 | blame | 历史
WorkM/bin/Release/WorkM.pdb 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb 补丁 | 查看 | 原始文档 | blame | 历史
APSM/bin/Release/APSM.dll
Binary files differ
APSM/bin/Release/APSM.pdb
Binary files differ
APSM/bin/Release/BLL.dll
Binary files differ
APSM/bin/Release/BLL.pdb
Binary files differ
APSM/bin/Release/BaseSet.dll
Binary files differ
APSM/bin/Release/BaseSet.pdb
Binary files differ
APSM/bin/Release/DAL.dll
Binary files differ
APSM/bin/Release/DAL.pdb
Binary files differ
APSM/bin/Release/Model.dll
Binary files differ
APSM/bin/Release/Model.pdb
Binary files differ
APSM/bin/Release/PlanM.dll
Binary files differ
APSM/bin/Release/PlanM.pdb
Binary files differ
APSM/bin/Release/WarM.dll
Binary files differ
APSM/bin/Release/WarM.pdb
Binary files differ
APSM/bin/Release/WorkM.dll
Binary files differ
APSM/bin/Release/WorkM.pdb
Binary files differ
BLL/bin/Release/BLL.dll
Binary files differ
BLL/bin/Release/BLL.pdb
Binary files differ
BLL/bin/Release/DAL.dll
Binary files differ
BLL/bin/Release/DAL.pdb
Binary files differ
BLL/bin/Release/Model.dll
Binary files differ
BLL/bin/Release/Model.pdb
Binary files differ
BaseSet/bin/Release/BLL.dll
Binary files differ
BaseSet/bin/Release/BLL.pdb
Binary files differ
BaseSet/bin/Release/BaseSet.dll
Binary files differ
BaseSet/bin/Release/BaseSet.pdb
Binary files differ
BaseSet/bin/Release/DAL.dll
Binary files differ
BaseSet/bin/Release/DAL.pdb
Binary files differ
BaseSet/bin/Release/Model.dll
Binary files differ
BaseSet/bin/Release/Model.pdb
Binary files differ
DAL/bin/Release/DAL.dll
Binary files differ
DAL/bin/Release/DAL.pdb
Binary files differ
DAL/bin/Release/Model.dll
Binary files differ
DAL/bin/Release/Model.pdb
Binary files differ
DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
Binary files differ
Model/bin/Release/Model.dll
Binary files differ
Model/bin/Release/Model.pdb
Binary files differ
Model/obj/Release/Model.dll
Binary files differ
Model/obj/Release/Model.pdb
Binary files differ
Model/²Ö¿â¹ÜÀí/ClsKf_StepFoldInBillMain.cs
@@ -22,6 +22,8 @@
        public string HExplanation; //        varchar(200)    --ÕªÒª 
        public string HInnerBillNo; //       varchar(50)        --内部单据号
        public Int64 HProjectID;        //-项目
        public Int64 HCurID;
    }
}
Model/²Ö¿â¹ÜÀí/ClsKf_StepFoldOutBillMain.cs
@@ -24,5 +24,7 @@
        public Int64 HCurID;
        public Int64 HPSStyleID;
        public Int64 HProjectID;        //-项目
    }
}
PlanM/bin/Release/BLL.dll
Binary files differ
PlanM/bin/Release/BLL.pdb
Binary files differ
PlanM/bin/Release/DAL.dll
Binary files differ
PlanM/bin/Release/DAL.pdb
Binary files differ
PlanM/bin/Release/Model.dll
Binary files differ
PlanM/bin/Release/Model.pdb
Binary files differ
PlanM/bin/Release/PlanM.dll
Binary files differ
PlanM/bin/Release/PlanM.pdb
Binary files differ
SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
Binary files differ
WarM/bin/Release/BLL.dll
Binary files differ
WarM/bin/Release/BLL.pdb
Binary files differ
WarM/bin/Release/DAL.dll
Binary files differ
WarM/bin/Release/DAL.pdb
Binary files differ
WarM/bin/Release/Model.dll
Binary files differ
WarM/bin/Release/Model.pdb
Binary files differ
WarM/bin/Release/WarM.dll
Binary files differ
WarM/bin/Release/WarM.pdb
Binary files differ
WebAPI/Controllers/²Ö´æ¹ÜÀí/ÁìÁÏ·¢»õ/Kf_StepFoldOutBillController.cs
@@ -246,9 +246,10 @@
                string HCloseMan = mainList[0].HCloseMan;
                string HCloseDate = mainList[0].HCloseDate;
                long HCurID = mainList[0].HCurID;
                long HProjectID = mainList[0].HProjectID;        //-项目
                //进行 ä¼šè®¡æœŸé—´ ç»“è´¦ çš„判断和控制
                string s = "";
        //进行 ä¼šè®¡æœŸé—´ ç»“è´¦ çš„判断和控制
        string s = "";
                int sYear = 0;
                int sPeriod = 0;
                if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
@@ -267,12 +268,12 @@
                        ,HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID,HKeeperID,HDeptID
                        ,HMaker,HMakeDate,HChecker,HUpDater
                        ,HDeleteMan,HCloseMan
                        ,HRemark,HExplanation,HInnerBillNo,HCurID)
                        ,HRemark,HExplanation,HInnerBillNo,HCurID,HProjectID)
                        values(" + HInterID + ",'" + HBillNo + "','" + HDate + "','" + 1250 + "','" +
                    1250 + "'," + HBillStatus + "," + DateTime.Now.Year + "," + DateTime.Now.Month + "," + HSupID +
                    "," + HWHID + "," + HSCWHID + "," + HEmpID + "," + HManagerID + "," + HSecManagerID +
                    "," + HKeeperID + "," + HDeptID + ",'" + HMaker + "','" + HMakeDate + "','" + HChecker + "','" + HUpDater + "','" + HDeleteMan + "','" + HCloseMan + "','"
                    + HRemark + "','" + HExplanation + "','" + HInnerBillNo + "'," + HCurID + "" + ")");
                    + HRemark + "','" + HExplanation + "','" + HInnerBillNo + "'," + HCurID + "," + HProjectID + "" + ")");
                }
                else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
                { //修改
@@ -300,7 +301,7 @@
                    String sql="update Kf_ICStockBillMain   set " +
                                    "HRemark='" + HRemark + "', HUpDater='" + HMaker + "', HUpDateDate=getdate()" +
                                 ",HSupID=" + HSupID + ",HWHID=" + HWHID + ",HSCWHID=" + HSCWHID + ", HEmpID=" + HEmpID + ",HManagerID=" + HManagerID + ",HSecManagerID = " + HSecManagerID
                                 + ",HKeeperID=" + HKeeperID + ",HDeptID=" + HDeptID + "  where HInterID=" + HInterID;
                                 + ",HKeeperID=" + HKeeperID + ",HDeptID=" + HDeptID + ",HProjectID=" + HProjectID + "  where HInterID=" + HInterID;
                    oCn.RunProc(sql);
                    //删除子表
WebAPI/Controllers/²Ö´æ¹ÜÀí/ÑéÊÕÈë¿â/Kf_StepFoldinBillController.cs
@@ -258,6 +258,7 @@
                string HCloseMan = mainList[0].HCloseMan;
                string HCloseDate = mainList[0].HCloseDate;
                long HCurID = mainList[0].HCurID;
                long HProjectID = mainList[0].HProjectID;        //-项目
                //进行 ä¼šè®¡æœŸé—´ ç»“è´¦ çš„判断和控制
                string s = "";
@@ -279,12 +280,12 @@
                        ,HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID,HKeeperID,HDeptID
                        ,HMaker,HMakeDate,HChecker,HUpDater
                        ,HDeleteMan,HCloseMan
                        ,HRemark,HExplanation,HInnerBillNo,HCurID)
                        ,HRemark,HExplanation,HInnerBillNo,HCurID,HProjectID)
                        values(" + HInterID + ",'" + HBillNo + "','" + HDate + "','" + 1251 + "','" +
                    1251 + "'," + HBillStatus + "," + DateTime.Now.Year + "," + DateTime.Now.Month + "," + HSupID +
                    "," + HWHID + "," + HSCWHID + "," + HEmpID + "," + HManagerID + "," + HSecManagerID +
                    "," + HKeeperID + "," + HDeptID + ",'" + HMaker + "','" + HMakeDate + "','" + HChecker + "','" + HUpDater + "','" + HDeleteMan + "','" + HCloseMan + "','"
                    + HRemark + "','" + HExplanation + "','" + HInnerBillNo + "'," + HCurID + "" + ")");
                    + HRemark + "','" + HExplanation + "','" + HInnerBillNo + "'," + HCurID + "," + HProjectID + "" + ")");
                }
                else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
                { //修改
@@ -311,7 +312,7 @@
                    String sql = "update Kf_ICStockBillMain   set " +
                               "HRemark='" + HRemark + "', HUpDater='" + HMaker + "', HUpDateDate=getdate()" +
                                 ",HSupID=" + HSupID + ",HWHID=" + HWHID + ",HSCWHID=" + HSCWHID + ", HEmpID=" + HEmpID + ",HManagerID=" + HManagerID + ",HSecManagerID = " + HSecManagerID
                                 + ",HKeeperID=" + HKeeperID + ",HDeptID=" + HDeptID + "  where HInterID=" + HInterID;
                                 + ",HKeeperID=" + HKeeperID + ",HDeptID=" + HDeptID + ",HProjectID=" + HProjectID + "  where HInterID=" + HInterID;
                    oCN.RunProc(sql);
WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <History>True|2024-11-26T00:24:31.3112433Z;False|2024-11-26T08:23:46.0894924+08:00;True|2024-11-20T10:16:03.7893118+08:00;False|2024-11-20T10:15:23.2632533+08:00;True|2024-11-20T09:06:55.2799108+08:00;False|2024-11-20T09:05:45.8751214+08:00;True|2024-11-15T10:50:02.2079520+08:00;False|2024-11-15T10:49:22.4156447+08:00;True|2024-11-11T16:53:33.6615343+08:00;False|2024-11-11T16:52:17.7499691+08:00;False|2024-11-06T11:32:23.8339166+08:00;True|2024-10-24T20:08:16.1196372+08:00;True|2024-10-24T14:53:21.0804405+08:00;False|2024-10-24T14:50:14.4659302+08:00;</History>
    <History>True|2024-11-26T00:55:53.9125170Z;True|2024-11-26T08:24:31.3112433+08:00;False|2024-11-26T08:23:46.0894924+08:00;True|2024-11-20T10:16:03.7893118+08:00;False|2024-11-20T10:15:23.2632533+08:00;True|2024-11-20T09:06:55.2799108+08:00;False|2024-11-20T09:05:45.8751214+08:00;True|2024-11-15T10:50:02.2079520+08:00;False|2024-11-15T10:49:22.4156447+08:00;True|2024-11-11T16:53:33.6615343+08:00;False|2024-11-11T16:52:17.7499691+08:00;False|2024-11-06T11:32:23.8339166+08:00;True|2024-10-24T20:08:16.1196372+08:00;True|2024-10-24T14:53:21.0804405+08:00;False|2024-10-24T14:50:14.4659302+08:00;</History>
    <_PublishTargetUrl>D:\网站发布\智云MESWMS\API</_PublishTargetUrl>
  </PropertyGroup>
  <ItemGroup>
@@ -45,19 +45,19 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>11/26/2024 08:24:01</publishTime>
      <publishTime>11/26/2024 08:55:11</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>11/26/2024 08:24:01</publishTime>
      <publishTime>11/26/2024 08:55:11</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>11/26/2024 08:23:59</publishTime>
      <publishTime>11/26/2024 08:55:07</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>11/26/2024 08:23:59</publishTime>
      <publishTime>11/26/2024 08:55:07</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
@@ -111,10 +111,10 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>11/26/2024 08:23:56</publishTime>
      <publishTime>11/26/2024 08:55:02</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>11/26/2024 08:23:56</publishTime>
      <publishTime>11/26/2024 08:55:02</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>04/06/2023 15:57:02</publishTime>
@@ -294,13 +294,13 @@
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>11/26/2024 08:24:26</publishTime>
      <publishTime>11/26/2024 08:55:48</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>11/26/2024 08:24:26</publishTime>
      <publishTime>11/26/2024 08:55:48</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>11/26/2024 08:24:30</publishTime>
      <publishTime>11/26/2024 08:55:52</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
WorkM/bin/Release/BLL.dll
Binary files differ
WorkM/bin/Release/BLL.pdb
Binary files differ
WorkM/bin/Release/DAL.dll
Binary files differ
WorkM/bin/Release/DAL.pdb
Binary files differ
WorkM/bin/Release/Model.dll
Binary files differ
WorkM/bin/Release/Model.pdb
Binary files differ
WorkM/bin/Release/WarM.dll
Binary files differ
WorkM/bin/Release/WarM.pdb
Binary files differ
WorkM/bin/Release/WorkM.dll
Binary files differ
WorkM/bin/Release/WorkM.pdb
Binary files differ
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
Binary files differ
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
Binary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
Binary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ