wtt
2024-10-08 981d377528af776e450d70a44c6df27ddf52e54e
班组计件类型
9个文件已修改
68 ■■■■■ 已修改文件
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_GroupController.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Models/Gy_Group.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user 40 ●●●● 补丁 | 查看 | 原始文档 | 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
@@ -1820,7 +1820,12 @@
                    {
                        omodel.MES_StationOutBill_MustBeginWorkCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //=========出站汇报单
                    //自动审核
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_AutoCheck")
                    {
                        omodel.MES_StationOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //=========设备工艺参数点检                   
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "SB_EquipICMOTechParamBill_MustBeginWorkCtl")
                    {
@@ -2004,6 +2009,14 @@
                    {
                        omodel.YS_ReceiveBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //=========考勤汇报单
                    //自动审核
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Pay_WorkTimesBill_AutoCheck")
                    {
                        omodel.Pay_WorkTimesBill_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
@@ -660,6 +660,9 @@
        //收款单
        public string YS_ReceiveBill_AutoCheck;       //保存后是否自动审核
        //考勤汇报单
        public string Pay_WorkTimesBill_AutoCheck;   //保存后是否自动审核
        //下模单
        public string Sc_MouldLowerBill_MouldUpper;  //必须做上模单才能生成下模单
WebAPI/Controllers/BaseSet/Gy_GroupController.cs
@@ -304,6 +304,7 @@
                long HProcID = list[0].HProcID;
                int HUSEORGID = list[0].HUSEORGID;
                string HCompName = list[0].HCompName;
                string HPayMentType = list[0].HPayMentType;
                var HDeptNumber = "";
                //var HEndFlag = 0;
                long HLevel = 1;
@@ -344,10 +345,10 @@
                    oCN.RunProc("Insert into Gy_Group " +
                    " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                    ",HEmpQty,HDeptID,HDeptNumber,HProcID" +
                    ",HLevel,HEndFlag,HStopflag,HRemark,HBarCodeForBase,HUSEORGID,HCompName) " +
                    ",HLevel,HEndFlag,HStopflag,HRemark,HBarCodeForBase,HUSEORGID,HCompName,HPayMentType) " +
                    " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
                    "," + HEmpQty.ToString() + "," + HDeptID.ToString() + ",'" + HDeptNumber + "'," + HProcID.ToString() +
                    "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "','" + HBarCodeForBase + "',"+ HUSEORGID + ",'" + HCompName + "')", ref DBUtility.ClsPub.sExeReturnInfo);
                    "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "','" + HBarCodeForBase + "',"+ HUSEORGID + ",'" + HCompName +"','"+ HPayMentType + "')", ref DBUtility.ClsPub.sExeReturnInfo);
                    //修改上级为非末级代码
                    oCN.RunProc("Update Gy_Group set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                    oCN.Commit();
@@ -366,7 +367,8 @@
                                 ",HRemark= '" + HRemark + "'" +
                                 ",HDeptID=" + HDeptID +
                                 ",HEmpQty=" + HEmpQty +
                                 ",HCompName='"+ HCompName+
                                 ",HCompName='"+ HCompName+"'"+
                                 ",HPayMentType='" + HPayMentType +
                                 "',HBarCodeForBase='" + HBarCodeForBase + "' " +
                                 ", HProcID = '" + HProcID + "'  Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                    oCN.RunProc("Update Gy_Group set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
WebAPI/Models/Gy_Group.cs
@@ -26,6 +26,8 @@
        public string HCompName { get; set; }//劳务单位
        public string HPayMentType { get; set; }//记件类型
    }
}
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
@@ -45,28 +45,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>10/07/2024 11:20:11</publishTime>
      <publishTime>10/08/2024 10:34:50</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>10/07/2024 11:20:11</publishTime>
      <publishTime>10/08/2024 10:34:50</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>10/07/2024 11:20:07</publishTime>
      <publishTime>10/08/2024 10:34:48</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>10/07/2024 11:20:07</publishTime>
      <publishTime>10/08/2024 10:34:48</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>10/07/2024 11:20:00</publishTime>
      <publishTime>10/08/2024 10:34:40</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>10/07/2024 11:20:00</publishTime>
      <publishTime>10/08/2024 10:34:40</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>10/07/2024 11:20:01</publishTime>
      <publishTime>10/08/2024 10:34:41</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>10/07/2024 11:20:01</publishTime>
      <publishTime>10/08/2024 10:34:41</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>04/15/2024 12:55:45</publishTime>
@@ -147,34 +147,34 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>10/07/2024 11:19:56</publishTime>
      <publishTime>10/08/2024 10:34:37</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>10/07/2024 11:19:56</publishTime>
      <publishTime>10/08/2024 10:34:37</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>10/07/2024 11:19:57</publishTime>
      <publishTime>10/08/2024 10:34:39</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>10/07/2024 11:19:57</publishTime>
      <publishTime>10/08/2024 10:34:39</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>10/07/2024 11:19:58</publishTime>
      <publishTime>10/08/2024 10:34:39</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>10/07/2024 11:19:58</publishTime>
      <publishTime>10/08/2024 10:34:39</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.dll">
      <publishTime>10/07/2024 11:17:43</publishTime>
      <publishTime>10/08/2024 10:32:31</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.pdb">
      <publishTime>10/07/2024 11:17:43</publishTime>
      <publishTime>10/08/2024 10:32:31</publishTime>
    </File>
    <File Include="bin/System.Buffers.dll">
      <publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,19 +285,19 @@
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>10/07/2024 11:17:51</publishTime>
      <publishTime>10/08/2024 10:32:36</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>10/07/2024 11:17:51</publishTime>
      <publishTime>10/08/2024 10:32:36</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>10/07/2024 11:20:57</publishTime>
      <publishTime>10/08/2024 10:35:31</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>10/07/2024 11:20:57</publishTime>
      <publishTime>10/08/2024 10:35:31</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