wtt
2024-09-04 a3fd494312a6f22551e65f1387e4a57409ea075d
一些单据添加自动审核系统参数
17个文件已修改
352 ■■■■■ 已修改文件
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CGGL/Cg_PayableBillController.cs 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CGGL/YF_PayMentBillController.cs 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user 38 ●●●● 补丁 | 查看 | 原始文档 | 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 | 历史
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -1956,7 +1956,54 @@
                    {
                        omodel.Kf_StockInRequestBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //=========采购订单
                    //自动审核
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Cg_POOrderBill_AutoCheck")
                    {
                        omodel.Cg_POOrderBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //=========应付单
                    //自动审核
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Cg_PayableBill_AutoCheck")
                    {
                        omodel.Cg_PayableBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //=========付款单
                    //自动审核
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "YF_PayMentBill_AutoCheck")
                    {
                        omodel.YF_PayMentBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //=========销售订单
                    //自动审核
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Xs_SeOrderBill_AutoCheck")
                    {
                        omodel.Xs_SeOrderBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //=========发货通知单
                    //自动审核
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Xs_SeOutStockBill_AutoCheck")
                    {
                        omodel.Xs_SeOutStockBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //=========应收单
                    //自动审核
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Xs_ReceivableBill_AutoCheck")
                    {
                        omodel.Xs_ReceivableBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //=========收款单
                    //自动审核
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "YS_ReceiveBill_AutoCheck")
                    {
                        omodel.YS_ReceiveBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    ////=========工序进站单
                    ////自动匹配流水号
                    //if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationBill_ProcNo")
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -638,6 +638,27 @@
        //入库申请
        public string Kf_StockInRequestBill_AutoCheck;       //保存后是否自动审核
        //采购订单
        public string Cg_POOrderBill_AutoCheck;       //保存后是否自动审核
        //应付单
        public string Cg_PayableBill_AutoCheck;       //保存后是否自动审核
        //付款单
        public string YF_PayMentBill_AutoCheck;       //保存后是否自动审核
        //销售订单
        public string Xs_SeOrderBill_AutoCheck;       //保存后是否自动审核
        //发货通知单
        public string Xs_SeOutStockBill_AutoCheck;       //保存后是否自动审核
        //应收单
        public string Xs_ReceivableBill_AutoCheck;       //保存后是否自动审核
        //收款单
        public string YS_ReceiveBill_AutoCheck;       //保存后是否自动审核
    }
         
}
WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
@@ -607,6 +607,29 @@
                //收料通知单新增回填采购订单关联数量
                oCN.RunProc("exec h_p_Cg_UpDatePOOrderRelation_Add " + HInterID);
                //自动审核设置
                if ((OperationType == 1 || OperationType == 2 || OperationType == 4))
                {
                    objJsonResult.HInterID = HInterID.ToString(); //返回主ID
                    //系统参数  自动审核
                    string sReturn = "";
                    if (oSystemParameter.ShowBill(ref sReturn) == true)
                    {
                        if (oSystemParameter.omodel.Cg_POInStockBill_AutoCheck == "Y") //系统参数  自动审核
                        {
                            objJsonResult.Verify = "Y";
                        }
                        else
                        {
                            objJsonResult.Verify = "N";
                        }
                    }
                }
                else if (OperationType == 3 )
                {
                    objJsonResult.HInterID = HInterID.ToString(); //返回主ID
                    objJsonResult.Verify = "N";
                }
                if (objJsonResult.code == "0")
                {
WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
@@ -867,7 +867,29 @@
                }
                //保存子表
                objJsonResult = AddBillSub(msg3, HInterID, OperationType);
                //自动审核设置
                if ((OperationType == 1 || OperationType == 2))
                {
                    objJsonResult.HInterID = HInterID.ToString(); //返回主ID
                    //系统参数  自动审核
                    string sReturn = "";
                    if (oSystemParameter.ShowBill(ref sReturn) == true)
                    {
                        if (oSystemParameter.omodel.Cg_POOrderBill_AutoCheck == "Y") //系统参数  自动审核
                        {
                            objJsonResult.Verify = "Y";
                        }
                        else
                        {
                            objJsonResult.Verify = "N";
                        }
                    }
                }
                else if (OperationType == 3)
                {
                    objJsonResult.HInterID = HInterID.ToString(); //返回主ID
                    objJsonResult.Verify = "N";
                }
                if (objJsonResult.code == "0")
                {
                    objJsonResult.code = "0";
WebAPI/Controllers/CGGL/Cg_PayableBillController.cs
@@ -239,6 +239,31 @@
                {
                    bResult = false;
                }
                //自动审核设置
                if (refSav == "Add")
                {
                    objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //返回主ID
                    //系统参数  自动审核
                    string sReturn = "";
                    if (oSystemParameter.ShowBill(ref sReturn) == true)
                    {
                        if (oSystemParameter.omodel.Cg_PayableBill_AutoCheck == "Y") //系统参数  自动审核
                        {
                            objJsonResult.Verify = "Y";
                        }
                        else
                        {
                            objJsonResult.Verify = "N";
                        }
                    }
                }
                else if (refSav == "Update")
                {
                    objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //返回主ID
                    objJsonResult.Verify = "N";
                }
                if (bResult)
                {
                    objJsonResult.code = "0";
WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs
@@ -15,6 +15,8 @@
    //采购入库单Controller
    public class Kf_POStockInBillController : ApiController
    {
        //获取系统参数
        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
        public DBUtility.ClsPub.Enum_BillStatus BillStatus;
        //public DAL.ClsCg_POInStockBill BillOld = new DAL.ClsCg_POInStockBill();
        public DAL.ClsKf_POStockInBill BillOld = new DAL.ClsKf_POStockInBill();
@@ -277,6 +279,30 @@
                //采购入库单新增回填收料通知单关联数量
                oCN.RunProc("exec h_p_Cg_UpDateRelation_POInStockToPOStockIn_Add " + HInterID);
                //自动审核设置
                if ((OperationType == 1 || OperationType == 2 || OperationType == 4))
                {
                    objJsonResult.HInterID = HInterID.ToString(); //返回主ID
                    //系统参数  自动审核
                    string sReturn = "";
                    if (oSystemParameter.ShowBill(ref sReturn) == true)
                    {
                        if (oSystemParameter.omodel.Kf_POStockInBill_AutoCheck == "Y") //系统参数  自动审核
                        {
                            objJsonResult.Verify = "Y";
                        }
                        else
                        {
                            objJsonResult.Verify = "N";
                        }
                    }
                }
                else if (OperationType == 3)
                {
                    objJsonResult.HInterID = HInterID.ToString(); //返回主ID
                    objJsonResult.Verify = "N";
                }
                if (objJsonResult.code == "0")
                {
WebAPI/Controllers/CGGL/YF_PayMentBillController.cs
@@ -284,6 +284,31 @@
                {
                    bResult = false;
                }
                //自动审核设置
                if (refSav == "Add")
                {
                    objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //返回主ID
                    //系统参数  自动审核
                    string sReturn = "";
                    if (oSystemParameter.ShowBill(ref sReturn) == true)
                    {
                        if (oSystemParameter.omodel.YF_PayMentBill_AutoCheck == "Y") //系统参数  自动审核
                        {
                            objJsonResult.Verify = "Y";
                        }
                        else
                        {
                            objJsonResult.Verify = "N";
                        }
                    }
                }
                else if (refSav == "Update")
                {
                    objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //返回主ID
                    objJsonResult.Verify = "N";
                }
                if (bResult)
                {
                    objJsonResult.code = "0";
WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs
@@ -387,6 +387,30 @@
                    bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
                }
                //自动审核设置
                if (Convert.ToInt32(OperationType) == 1 || Convert.ToInt32(OperationType) == 4)
                {
                    objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //返回主ID
                    //系统参数  自动审核
                    string sReturn = "";
                    if (oSystemParameter.ShowBill(ref sReturn) == true)
                    {
                        if (oSystemParameter.omodel.Kf_SellOutBill_AutoCheck == "Y") //系统参数  自动审核
                        {
                            objJsonResult.Verify = "Y";
                        }
                        else
                        {
                            objJsonResult.Verify = "N";
                        }
                    }
                }
                else
                {
                    objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //返回主ID
                    objJsonResult.Verify = "N";
                }
                if (bResult)
                {
                    objJsonResult.code = "0";
WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs
@@ -257,6 +257,31 @@
                {
                    bResult = false;
                }
                //自动审核设置
                if (refSav == "Add")
                {
                    objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //返回主ID
                    //系统参数  自动审核
                    string sReturn = "";
                    if (oSystemParameter.ShowBill(ref sReturn) == true)
                    {
                        if (oSystemParameter.omodel.Xs_ReceivableBill_AutoCheck == "Y") //系统参数  自动审核
                        {
                            objJsonResult.Verify = "Y";
                        }
                        else
                        {
                            objJsonResult.Verify = "N";
                        }
                    }
                }
                else if (refSav == "Update")
                {
                    objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //返回主ID
                    objJsonResult.Verify = "N";
                }
                if (bResult)
                {
                    objJsonResult.code = "0";
WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
@@ -1336,6 +1336,31 @@
                {
                    bResult = false;
                }
                //自动审核设置
                if (refSav == "Add")
                {
                    objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //返回主ID
                    //系统参数  自动审核
                    string sReturn = "";
                    if (oSystemParameter.ShowBill(ref sReturn) == true)
                    {
                        if (oSystemParameter.omodel.Xs_SeOrderBill_AutoCheck == "Y") //系统参数  自动审核
                        {
                            objJsonResult.Verify = "Y";
                        }
                        else
                        {
                            objJsonResult.Verify = "N";
                        }
                    }
                }
                else if (refSav == "Update")
                {
                    objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //返回主ID
                    objJsonResult.Verify = "N";
                }
                if (bResult)
                {
                    objJsonResult.code = "0";
WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs
@@ -430,6 +430,30 @@
               //发货通知的 反写 数量到 销售订单 关联数量
                oCN.RunProcReturn("exec h_p_Xs_SeOutStockBillMain " + HInterID, "h_p_Xs_SeOutStockBillMain");
                //自动审核设置
                if ((OperationType == 1 || OperationType == 2))
                {
                    objJsonResult.HInterID = HInterID.ToString(); //返回主ID
                    //系统参数  自动审核
                    string sReturn = "";
                    if (oSystemParameter.ShowBill(ref sReturn) == true)
                    {
                        if (oSystemParameter.omodel.Xs_SeOutStockBill_AutoCheck == "Y") //系统参数  自动审核
                        {
                            objJsonResult.Verify = "Y";
                        }
                        else
                        {
                            objJsonResult.Verify = "N";
                        }
                    }
                }
                else if (OperationType == 3)
                {
                    objJsonResult.HInterID = HInterID.ToString(); //返回主ID
                    objJsonResult.Verify = "N";
                }
                //保存后控制=========================================
                ds = oCN.RunProcReturn("Exec h_p_Xs_SeOutStockBill_AfterSaveCtrl " + HInterID.ToString() + ", '" + HBillNo + "',1 ", "h_p_Xs_SeOutStockBill_AfterSaveCtrl");
WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs
@@ -244,6 +244,31 @@
                {
                    bResult = false;
                }
                //自动审核设置
                if (refSav == "Add")
                {
                    objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //返回主ID
                    //系统参数  自动审核
                    string sReturn = "";
                    if (oSystemParameter.ShowBill(ref sReturn) == true)
                    {
                        if (oSystemParameter.omodel.YS_ReceiveBill_AutoCheck == "Y") //系统参数  自动审核
                        {
                            objJsonResult.Verify = "Y";
                        }
                        else
                        {
                            objJsonResult.Verify = "N";
                        }
                    }
                }
                else if (refSav == "Update")
                {
                    objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //返回主ID
                    objJsonResult.Verify = "N";
                }
                if (bResult)
                {
                    objJsonResult.code = "0";
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <History>True|2024-08-29T00:06:32.4732067Z;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History>
    <History>True|2024-09-03T08:52:02.8227375Z;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History>
    <_PublishTargetUrl>G:\issWeb\网站发布\API</_PublishTargetUrl>
  </PropertyGroup>
  <ItemGroup>
@@ -45,28 +45,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>08/29/2024 08:06:19</publishTime>
      <publishTime>09/03/2024 16:51:52</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>08/29/2024 08:06:19</publishTime>
      <publishTime>09/03/2024 16:51:52</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>08/29/2024 08:06:16</publishTime>
      <publishTime>09/03/2024 16:51:49</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>08/29/2024 08:06:16</publishTime>
      <publishTime>09/03/2024 16:51:49</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>08/26/2024 10:16:44</publishTime>
      <publishTime>09/03/2024 16:51:43</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>08/26/2024 10:16:44</publishTime>
      <publishTime>09/03/2024 16:51:43</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
@@ -111,10 +111,10 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>08/26/2024 10:16:47</publishTime>
      <publishTime>09/03/2024 16:51:44</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>08/26/2024 10:16:47</publishTime>
      <publishTime>09/03/2024 16:51:44</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>04/15/2024 12:55:45</publishTime>
@@ -147,25 +147,25 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>08/26/2024 10:16:41</publishTime>
      <publishTime>09/03/2024 16:51:41</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>08/26/2024 10:16:41</publishTime>
      <publishTime>09/03/2024 16:51:41</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>08/26/2024 10:16:43</publishTime>
      <publishTime>09/03/2024 16:51:41</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>08/26/2024 10:16:43</publishTime>
      <publishTime>09/03/2024 16:51:41</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>08/26/2024 10:16:43</publishTime>
      <publishTime>09/03/2024 16:51:42</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>08/26/2024 10:16:43</publishTime>
      <publishTime>09/03/2024 16:51:42</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
@@ -279,19 +279,19 @@
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>08/29/2024 07:57:46</publishTime>
      <publishTime>09/03/2024 16:49:55</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>08/29/2024 07:57:46</publishTime>
      <publishTime>09/03/2024 16:49:55</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>08/29/2024 08:06:26</publishTime>
      <publishTime>09/03/2024 16:51:59</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>08/29/2024 08:06:26</publishTime>
      <publishTime>09/03/2024 16:51:59</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>08/16/2024 16:55:28</publishTime>
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