Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

wtt

2024-10-25 e7965a19a7c7cfb8fdb28ed6cc922d523c7d4aeb

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

 DAL/ÐÅϢƽ̨/ClsOA_ErrMsgBackHandleBill.cs

@@ -86,7 +86,7 @@
                 ",HErrMsgBackBillNo='" + omodel.HErrMsgBackBillNo +
                 "',HErrMsgBackInterID='" + omodel.HErrMsgBackInterID.ToString() +
                 "',HErrMsgBackEntryID='" + omodel.HErrMsgBackEntryID.ToString() +

                 "',HBadReasonID='" + omodel.HBadReasonID.ToString() +
                "' where HInterID=" + lngBillKey.ToString());
                //删除关联
                DeleteRelation(ref sReturn, lngBillKey);
@@ -150,7 +150,7 @@

                sql = "Insert Into OA_ErrMsgBackHandleBillMain" +
                "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HYear,HPeriod,HRemark,HMaker,HMakeDate,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType," +
                "HDeptID,HReceiveID,HSendMan,HReceiveMan,HCopyMan,HLevel,HErrMsgBackTypeID,HContext,HDescription,HBillTypeName,HPlanBillNo,HMaterName,HMaterModel,HEquipID,HMouldID,HHandleEmpID,HHandleNote,HHandleResult,HHandleDate,HErrMsgBackBillNo,HErrMsgBackInterID,HErrMsgBackEntryID) " +
                "HDeptID,HReceiveID,HSendMan,HReceiveMan,HCopyMan,HLevel,HErrMsgBackTypeID,HContext,HDescription,HBillTypeName,HPlanBillNo,HMaterName,HMaterModel,HEquipID,HMouldID,HHandleEmpID,HHandleNote,HHandleResult,HHandleDate,HErrMsgBackBillNo,HErrMsgBackInterID,HErrMsgBackEntryID,HBadReasonID) " +
                " values(" +
                "'" + this.BillType +
                "','" + this.HBillSubType +
@@ -189,7 +189,7 @@
                 "','" + omodel.HErrMsgBackBillNo +
                "','" + omodel.HErrMsgBackInterID.ToString() +
                "','" + omodel.HErrMsgBackEntryID.ToString() +

                 "','" + omodel.HBadReasonID.ToString() +
                "') ";
                //主表
                oCn.RunProc(sql);

 DAL/Öʼì¹ÜÀí/ClsQC_MonthTarGetBill.cs

@@ -221,11 +221,11 @@
                omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
                omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
                omodel.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"]);
                omodel.HProcTrapTarGetVal = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HProcTrapTarGetVal"]);
                omodel.HProcKPITarGetVal = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HProcKPITarGetVal"]);
                omodel.HProcOmitTarGetVal = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HProcOmitTarGetVal"]); ;
                omodel.HProcPPMTarGetVal = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HProcPPMTarGetVal"]);
                omodel.HInspectOrgID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInspectOrgID"]);
                omodel.HProcTrapTarGetVal = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HProcTrapTarGetVal"]);
                omodel.HProcKPITarGetVal = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HProcKPITarGetVal"]);
                omodel.HProcOmitTarGetVal = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HProcOmitTarGetVal"]); ;
                omodel.HProcPPMTarGetVal = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HProcPPMTarGetVal"]);
                omodel.HInspectOrgID = DBUtility.ClsPub.isDoule(Ds.Tables[0].Rows[0]["HInspectOrgID"]);
                //

                //循环

 Model/ÐÅϢƽ̨/ClsOA_ErrMsgBackHandleBillMain.cs

@@ -28,5 +28,6 @@
        public string HErrMsgBackBillNo;    //异常反馈单号
        public int HErrMsgBackInterID;  //异常反馈单主内码
        public int HErrMsgBackEntryID;  //异常反馈单子内码
        public int HBadReasonID;  //处理原因
    }
}

 Model/Öʼì¹ÜÀí/ClsQC_MonthTarGetBillMain.cs

@@ -7,12 +7,12 @@
    public class ClsQC_MonthTarGetBillMain : DBUtility.ClsXt_BaseBillMain
    {
        public Int64 HDeptID;
        public Int64 HProcTrapTarGetVal;
        public Int64 HProcKPITarGetVal;
        public Int64 HProcOmitTarGetVal;
        public Int64 HProcPPMTarGetVal;
        public Int64 HProcTarGetVal; //各工序目标值
        public Int64 HInspectOrgID;
        public double HProcTrapTarGetVal;
        public double HProcKPITarGetVal;
        public double HProcOmitTarGetVal;
        public double HProcPPMTarGetVal;
        public double HProcTarGetVal; //各工序目标值
        public double HInspectOrgID;

    }
}

 SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt

@@ -10,3 +10,9 @@
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
D:\智云迈思\MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\智云迈思\MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
D:\智云迈思\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\智云迈思\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\智云迈思\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
D:\智云迈思\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache

 WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs

@@ -471,7 +471,6 @@
                    ",HShiftsID=" + HShiftsID +
                    ",HBackWorkByMaterQty=" + HBackWorkByMaterQty +
                    ",HMouldID=" + HMouldID +
                    ",HGroupID=" + HGroupID +
                    " where HInterID=" + HInterID);

                    LogService.Write("用户:" + user + ",日期:" + DateTime.Now + ",修改工序出站单据:" + HBillNo);

 WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user

@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <_PublishTargetUrl>D:\网站发布\智云MESWMS\API</_PublishTargetUrl>
    <History>True|2024-10-24T03:17:46.9974483Z;False|2024-10-24T11:17:17.0925356+08:00;True|2024-10-23T19:16:25.5189930+08:00;True|2024-10-23T17:10:44.4267777+08:00;False|2024-10-23T17:10:10.2947971+08:00;True|2024-10-23T14:13:22.6901287+08:00;False|2024-10-23T14:12:24.3997100+08:00;True|2024-10-22T16:25:12.9514711+08:00;False|2024-10-22T16:24:42.9025167+08:00;True|2024-10-22T10:22:33.9932601+08:00;False|2024-10-22T10:22:05.3030308+08:00;True|2024-10-21T17:53:29.9552741+08:00;True|2024-10-21T16:37:31.4159544+08:00;True|2024-10-21T16:35:43.6207036+08:00;True|2024-10-21T16:00:05.5040651+08:00;False|2024-10-21T15:59:35.9279259+08:00;True|2024-10-21T12:06:42.5768961+08:00;False|2024-10-21T12:06:16.6344662+08:00;True|2024-10-18T10:44:02.6495536+08:00;True|2024-10-18T09:55:47.9769914+08:00;True|2024-10-18T09:47:46.6365831+08:00;True|2024-10-18T09:46:40.4036657+08:00;True|2024-10-18T09:44:25.4598960+08:00;True|2024-10-18T09:30:07.6972377+08:00;False|2024-10-18T09:28:18.9251743+08:00;True|2024-10-17T12:13:34.8639685+08:00;True|2024-10-17T12:02:26.5251711+08:00;False|2024-10-17T12:01:31.3822430+08:00;True|2024-10-17T11:49:09.2395208+08:00;False|2024-10-17T11:48:38.0189241+08:00;True|2024-10-16T19:35:29.2047484+08:00;False|2024-10-16T19:32:43.0637947+08:00;True|2024-10-16T11:27:13.1263407+08:00;False|2024-10-16T11:25:49.8688677+08:00;True|2024-10-15T18:26:50.9948482+08:00;False|2024-10-15T18:26:23.6998750+08:00;True|2024-08-26T14:17:37.8502046+08:00;False|2024-08-26T14:16:09.8501361+08:00;True|2024-08-22T11:12:48.4249984+08:00;</History>
    <History>True|2024-10-25T03:49:47.9817458Z;True|2024-10-25T11:49:34.4754546+08:00;True|2024-10-25T09:59:35.6471379+08:00;True|2024-10-25T09:47:46.8035540+08:00;True|2024-10-25T09:25:57.7872618+08:00;False|2024-10-25T09:25:30.0950732+08:00;True|2024-10-24T20:39:06.1992535+08:00;False|2024-10-24T20:38:33.1009731+08:00;True|2024-10-24T11:17:46.9974483+08:00;False|2024-10-24T11:17:17.0925356+08:00;True|2024-10-23T19:16:25.5189930+08:00;True|2024-10-23T17:10:44.4267777+08:00;False|2024-10-23T17:10:10.2947971+08:00;True|2024-10-23T14:13:22.6901287+08:00;False|2024-10-23T14:12:24.3997100+08:00;True|2024-10-22T16:25:12.9514711+08:00;False|2024-10-22T16:24:42.9025167+08:00;True|2024-10-22T10:22:33.9932601+08:00;False|2024-10-22T10:22:05.3030308+08:00;True|2024-10-21T17:53:29.9552741+08:00;True|2024-10-21T16:37:31.4159544+08:00;True|2024-10-21T16:35:43.6207036+08:00;True|2024-10-21T16:00:05.5040651+08:00;False|2024-10-21T15:59:35.9279259+08:00;True|2024-10-21T12:06:42.5768961+08:00;False|2024-10-21T12:06:16.6344662+08:00;True|2024-10-18T10:44:02.6495536+08:00;True|2024-10-18T09:55:47.9769914+08:00;True|2024-10-18T09:47:46.6365831+08:00;True|2024-10-18T09:46:40.4036657+08:00;True|2024-10-18T09:44:25.4598960+08:00;True|2024-10-18T09:30:07.6972377+08:00;False|2024-10-18T09:28:18.9251743+08:00;True|2024-10-17T12:13:34.8639685+08:00;True|2024-10-17T12:02:26.5251711+08:00;False|2024-10-17T12:01:31.3822430+08:00;True|2024-10-17T11:49:09.2395208+08:00;False|2024-10-17T11:48:38.0189241+08:00;True|2024-10-16T19:35:29.2047484+08:00;False|2024-10-16T19:32:43.0637947+08:00;True|2024-10-16T11:27:13.1263407+08:00;False|2024-10-16T11:25:49.8688677+08:00;True|2024-10-15T18:26:50.9948482+08:00;False|2024-10-15T18:26:23.6998750+08:00;True|2024-08-26T14:17:37.8502046+08:00;False|2024-08-26T14:16:09.8501361+08:00;True|2024-08-22T11:12:48.4249984+08:00;</History>
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
@@ -45,28 +45,28 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>10/24/2024 11:17:28</publishTime>
      <publishTime>10/25/2024 11:49:15</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>10/24/2024 11:17:28</publishTime>
      <publishTime>10/25/2024 11:49:15</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>10/24/2024 11:17:27</publishTime>
      <publishTime>10/25/2024 11:49:14</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>10/24/2024 11:17:27</publishTime>
      <publishTime>10/25/2024 11:49:14</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>10/24/2024 11:17:24</publishTime>
      <publishTime>10/25/2024 11:49:10</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>10/24/2024 11:17:24</publishTime>
      <publishTime>10/25/2024 11:49:10</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/24/2024 11:17:24</publishTime>
      <publishTime>10/25/2024 11:49:11</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>10/24/2024 11:17:24</publishTime>
      <publishTime>10/25/2024 11:49:11</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>05/25/2024 09:46:41</publishTime>
@@ -147,34 +147,34 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>10/24/2024 11:17:22</publishTime>
      <publishTime>10/25/2024 11:49:09</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>10/24/2024 11:17:22</publishTime>
      <publishTime>10/25/2024 11:49:09</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>10/24/2024 11:17:23</publishTime>
      <publishTime>10/25/2024 11:49:09</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>10/24/2024 11:17:23</publishTime>
      <publishTime>10/25/2024 11:49:09</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>10/24/2024 11:17:23</publishTime>
      <publishTime>10/25/2024 11:49:10</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>10/24/2024 11:17:23</publishTime>
      <publishTime>10/25/2024 11:49:10</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.dll">
      <publishTime>10/24/2024 11:16:35</publishTime>
      <publishTime>10/25/2024 11:48:26</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.pdb">
      <publishTime>10/24/2024 11:16:35</publishTime>
      <publishTime>10/25/2024 11:48:26</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/24/2024 11:16:37</publishTime>
      <publishTime>10/25/2024 11:48:28</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>10/24/2024 11:16:37</publishTime>
      <publishTime>10/25/2024 11:48:28</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>10/24/2024 11:17:09</publishTime>
      <publishTime>10/25/2024 11:48:58</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>10/24/2024 11:17:09</publishTime>
      <publishTime>10/25/2024 11:48:58</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
@@ -492,7 +492,7 @@
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>10/15/2024 10:32:48</publishTime>
      <publishTime>10/24/2024 20:39:05</publishTime>
    </File>
  </ItemGroup>
</Project>

 sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt

@@ -6,7 +6,6 @@
E:\智云mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
D:\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
D:\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
D:\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
D:\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
@@ -22,3 +21,4 @@
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
D:\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache