11
pzy
2024-08-23 72e0c48841482d66677f636b1796002f7b7fbe82
11
38个文件已删除
42个文件已修改
2个文件已添加
7254 ■■■■ 已修改文件
DAL/应收管理/ClsYS_ReceiveBill.cs 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/质检管理/ClsQC_PatrolProcCheckOtherBill.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
LMES/DingDing_autoGetData.resx 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
Model/Model.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/质检管理/ClsQC_PatrolProcCheckOtherBillSub.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/车间管理/ClsSc_ProcessExchangeBillSub_BatchSplit.cs 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Cj_SingleStationController.cs 80 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Cj_StationInBillController.cs 58 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs 303 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/品质管理/巡检单/QC_PatrolProcCheckOtherBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/品质管理/质量报表/QC_QualityReportsController.cs 82 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/基础资料/基础资料/Gy_UnitConvertRateController.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/工资管理/HR_EmployeeSkillExamBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/数据同步/钉钉同步/DD_DataSynchronizationController.cs 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/ListModels.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user 298 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml.user 450 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile12.pubxml 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile12.pubxml.user 486 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile13.pubxml 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile13.pubxml.user 459 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile14.pubxml 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile14.pubxml.user 459 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile15.pubxml 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile15.pubxml.user 492 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile16.pubxml 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile16.pubxml.user 462 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile17.pubxml 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile17.pubxml.user 459 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile18.pubxml 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile18.pubxml.user 462 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile19.pubxml 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile19.pubxml.user 492 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile20.pubxml 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile20.pubxml.user 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml.user 259 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile3.pubxml 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile3.pubxml.user 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml.user 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile5.pubxml 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile5.pubxml.user 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile7.pubxml 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile7.pubxml.user 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile8.pubxml 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile8.pubxml.user 450 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile9.pubxml 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile9.pubxml.user 450 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user 295 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Web.config 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebAPI.csproj.user 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/bin/Release/TopSdk.dll 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/bin/Release/TopSdk.pdb 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Debug/TopSdk.csprojAssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Release/TopSdk.dll 补丁 | 查看 | 原始文档 | blame | 历史
sdk_dingding/TopSdk/obj/Release/TopSdk.pdb 补丁 | 查看 | 原始文档 | blame | 历史
DAL/Ó¦ÊÕ¹ÜÀí/ClsYS_ReceiveBill.cs
@@ -31,8 +31,50 @@
        {
            DetailColl = null;
        }
        #endregion   è‡ªå®šä¹‰æ–¹æ³•
        //删除关联
        public override void DeleteRelation(ref string sReturn, Int64 lngBillKey)
        {
            //应收单 å…³è”数量
            try
            {
                if (DetailColl[0].HSourceBillType == "1114")                    //应收单
                {
                    oCn.RunProc("exec h_p_Xs_UpDateRelation_ReceiveToReceivableIn_Del " + lngBillKey.ToString());
                }
                else
                {
                }
            }
            catch (Exception e)
            {
                throw (e);
            }
        }
        //新增关联
        public override void AddNewRelation(ref string sReturn, Int64 lngBillKey)
        {
            //应收单 å…³è”数量
            try
            {
                if (DetailColl[0].HSourceBillType == "1114")                    //应收单
                {
                    oCn.RunProc("exec h_p_Xs_UpDateRelation_ReceiveToReceivableIn_Add " + lngBillKey.ToString());
                }
                else
                {
                }
            }
            catch (Exception e)
            {
                throw (e);
            }
        }
        //修改单据
        public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
        {
@@ -96,8 +138,11 @@
                oCn.RunProc(mainSql);
                //删除关联
                DeleteRelation(ref sReturn, lngBillKey);
                if (DetailColl.Count != 0)
                {
                    //删除关联
                    DeleteRelation(ref sReturn, lngBillKey);
                }
                //删除子表
                DeleteBillSub(lngBillKey);
                //插入子表
@@ -116,13 +161,17 @@
                      + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
                      "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
                      "," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() +
                      ",'" + oSub.HReceiveBillNo + "'," + oSub.HReceiveBillInterID.ToString() + "," + oSub.HReceiveBillEntryID.ToString() + "," + oSub.HSourceDate.ToString() + "," + oSub.HSourceMoney.ToString() +
                      ",'" + oSub.HReceiveBillNo + "'," + oSub.HReceiveBillInterID.ToString() + "," + oSub.HReceiveBillEntryID.ToString() + ",'" + oSub.HSourceDate.ToString() + "'," + oSub.HSourceMoney.ToString() +
                      "," + oSub.HSourceMoneyBB.ToString() + "," + oSub.HReadyCheckMoney.ToString() + "," + oSub.HUnCheckMoney.ToString() + "," + oSub.HCheckMoney.ToString() + "," + oSub.HCheckMoneyBB.ToString() + "," + oSub.HInovceExRate.ToString() + ",'" + oSub.HSeContractBillNo + "'" +
                      "," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
                      "," + oSub.HPOContractInterID.ToString() + "," + oSub.HPOContractEntryID.ToString() + ",'" + oSub.HPOContractBillNo + "'," + oSub.HSeContractInterID.ToString() + "," + oSub.HSeContractEntryID.ToString() + ",'" + oSub.HSeContractBillNo + "'" +
                      ") ");
                }
                if (DetailColl.Count != 0)
                {
                    //更新订单关联数量
                    AddNewRelation(ref sReturn, omodel.HInterID);
                }
                //=========================保存后控制  
                DataSet ds2 = oCn.RunProcReturn("h_p_YS_ReceiveBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_YS_ReceiveBill_AfterSaveCtrl");
                if (ds2 == null)
@@ -268,7 +317,7 @@
                      + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
                      "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
                      "," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() +
                      ",'" + oSub.HReceiveBillNo + "'," + oSub.HReceiveBillInterID.ToString() + "," + oSub.HReceiveBillEntryID.ToString() + "," + oSub.HSourceDate.ToString() + "," + oSub.HSourceMoney.ToString() +
                      ",'" + oSub.HReceiveBillNo + "'," + oSub.HReceiveBillInterID.ToString() + "," + oSub.HReceiveBillEntryID.ToString() + ",'" + oSub.HSourceDate.ToString() + "'," + oSub.HSourceMoney.ToString() +
                      "," + oSub.HSourceMoneyBB.ToString() + "," + oSub.HReadyCheckMoney.ToString() + "," + oSub.HUnCheckMoney.ToString() + "," + oSub.HCheckMoney.ToString() + "," + oSub.HCheckMoneyBB.ToString() + "," + oSub.HInovceExRate.ToString() + ",'" + oSub.HSeContractBillNo + "'" +
                      "," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
                      "," + oSub.HPOContractInterID.ToString() + "," + oSub.HPOContractEntryID.ToString() + ",'" + oSub.HPOContractBillNo + "'," + oSub.HSeContractInterID.ToString() + "," + oSub.HSeContractEntryID.ToString() + ",'" + oSub.HSeContractBillNo + "'" +
@@ -276,6 +325,13 @@
                    oCn.RunProc(subSql);
                }
                if (DetailColl.Count != 0)
                {
                //更新订单关联数量
                AddNewRelation(ref sReturn, omodel.HInterID);
                }
                //=========================保存后控制  
                DataSet ds2 = oCn.RunProcReturn("h_p_YS_ReceiveBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_YS_ReceiveBill_AfterSaveCtrl");
                if (ds2 == null)
DAL/Öʼì¹ÜÀí/ClsQC_PatrolProcCheckOtherBill.cs
@@ -151,7 +151,7 @@
                      ",'" + oSub.HMax + "','" + oSub.HMin + "','" + oSub.HAvg + "'" + "," + oSub.HSampleSchemeID + "," + oSub.HSampleQty + 
                      "," + oSub.HSampleDamageQty + "," + oSub.HAcceptQty + "," + oSub.HRejectQty + "," + oSub.HSampleUnRightQty + ",'" + oSub.HStatus +
                      "'," + oSub.HUnitID + ",'" + oSub.HInspectValB + "','" + oSub.HInspectVal + "','" + oSub.HTargetValB + "','" + oSub.HTargetVal + "','" + oSub.HUpLimit + "','" + oSub.HDownLimit +
                      "','" + oSub.HUpOffSet + "','" + oSub.HDownOffSet + "'," + oSub.HKeyInspect + ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult + "'" + ") ");
                      "','" + oSub.HUpOffSet + "','" + oSub.HDownOffSet + "'," + Convert.ToString(oSub.HKeyInspect ? 1 : 0)+ ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult + "'" + ") ");
                }
              
                sReturn = "新增单据成功!";
LMES/DingDing_autoGetData.resx
@@ -452,4 +452,7 @@
  <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>333, 17</value>
  </metadata>
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>192</value>
  </metadata>
</root>
LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache
Binary files differ
Model/Model.csproj
@@ -702,6 +702,7 @@
    <Compile Include="车间管理\ClsGy_WorkBeginDotCheckListBillMain.cs" />
    <Compile Include="车间管理\ClsCJ_WIPBeginStockBillMain.cs" />
    <Compile Include="车间管理\ClsCJ_WIPBeginStockBillSub.cs" />
    <Compile Include="车间管理\ClsSc_ProcessExchangeBillSub_BatchSplit.cs" />
    <Compile Include="车间管理\ClsSc_WorkBeginDotCheckBillMain.cs" />
    <Compile Include="车间管理\ClsGy_MaterPreventErrMouldBillSub.cs" />
    <Compile Include="车间管理\ClsQc_PreventErrMouldCheckBillSub.cs" />
Model/Öʼì¹ÜÀí/ClsQC_PatrolProcCheckOtherBillSub.cs
@@ -20,7 +20,7 @@
        public string HInSpectValT;
        public string HDefectLevel;
        public bool HDestructInspect;
        public double HKeyInspect;
        public bool HKeyInspect;
        public string HStatus;
        public Int64 HSampleQty;
        public Int64 HSampleSchemeID;
Model/³µ¼ä¹ÜÀí/ClsSc_ProcessExchangeBillSub_BatchSplit.cs
New file
@@ -0,0 +1,22 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace Model
{
    public class ClsSc_ProcessExchangeBillSub_BatchSplit : DBUtility.ClsXt_BaseBillSub
    {
        public Int64 HICMOInterID;//生产订单主内码
        public Int64 HICMOEntryID;//生产订单子内码
        public string HICMOBillNo;//生产订单号
        public Int64 HMaterID;//物料内码
        public double HQty;//生产订单数量
        public double HFinishQty;//已生成流转卡数量
        public double HUsableQty;//剩余可生成流转卡数量
        public double HProQty;//流转卡数量
        public Int64 HRoutingInterID;//工艺路线内码
        public DateTime HDate;//流转卡日期
    }
}
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -1816,6 +1816,16 @@
                    {
                        omodel.MES_StationOutBill_SaveAutoAddnew = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationOutBill_MustBeginWorkCtl")
                    {
                        omodel.MES_StationOutBill_MustBeginWorkCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //=========设备工艺参数点检
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "SB_EquipICMOTechParamBill_MustBeginWorkCtl")
                    {
                        omodel.SB_EquipICMOTechParamBill_MustBeginWorkCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //=========工序委外发出单
                    //自动新增
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -529,6 +529,7 @@
        public string MES_StationOutBill_DeleteRelationCtl;              //出站汇报单删除时是否进行关联控制
        public string MES_StationOutBill_NextQtyCtl;                //本道出站数量不允许小于下道进站数量
        public string MES_StationOutBill_QtyRateCtl;              //本道出站数量汇总数不能大于流转卡数量上限
        public string MES_StationOutBill_MustBeginWorkCtl;              //必须开工状态才能保存单据
        //不良品评审单
        public string QC_NoPassProdCheckBill_AutoCheck;                        //保存后是否自动审核
@@ -620,7 +621,8 @@
        public string QC_ProcessCheckBill_QCSchemeSource;               //质检方案来源
        //设备工艺参数订单点检表
        public string SB_EquipICMOTechParamBill_MustBeginWorkCtl;              //必须开工状态才能保存单据
        //工艺路线
        public string Gy_RoutingBill_AutoCheck;                     //保存后是否自动审核
WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
@@ -87,6 +87,7 @@
            public bool IsHide;
            public string Alignment;
            public string ColumnWidth;
            public string ColumnName_Other;
        }
        [Route("Xt_grdAlignment_WMES/AddgrdAlignmentWMES")]
@@ -136,7 +137,10 @@
                    var width = omdelsub[i].ColumnWidth;
                    if (string.IsNullOrEmpty(width) || DBUtility.ClsPub.isLong(width) == 0)
                        width = "120";
                    HGridString += $"{(i + 1)}|{(omdelsub[i].IsHide == true ? 1 : 0)}|{omdelsub[i].Alignment}|{width},";
                    var ColumnName_Other = (omdelsub[i].ColumnName_Other == null || omdelsub[i].ColumnName_Other.Trim() == "") ? omdelsub[i].ColumnName : omdelsub[i].ColumnName_Other;
                    HGridString += $"{(i + 1)}|{(omdelsub[i].IsHide == true ? 1 : 0)}|{omdelsub[i].Alignment}|{width}|{ColumnName_Other}|{omdelsub[i].ColumnName},";
                }
                HGridString = HGridString.Substring(0, HGridString.Length - 1);
@@ -219,7 +223,9 @@
                    var width = omdelsub[i].ColumnWidth;
                    if (string.IsNullOrEmpty(width) || DBUtility.ClsPub.isLong(width) == 0)
                        width = "120";
                    HGridString += $"{(i + 1)}|{(omdelsub[i].IsHide == true ? 1 : 0)}|{omdelsub[i].Alignment}|{width}|{omdelsub[i].ColumnName},";
                    var ColumnName_Other = (omdelsub[i].ColumnName_Other == null || omdelsub[i].ColumnName_Other.Trim() == "") ? omdelsub[i].ColumnName : omdelsub[i].ColumnName_Other;
                    HGridString += $"{(i + 1)}|{(omdelsub[i].IsHide == true ? 1 : 0)}|{omdelsub[i].Alignment}|{width}|{ColumnName_Other}|{omdelsub[i].ColumnName},";
                }
                HGridString = HGridString.Substring(0, HGridString.Length - 1);
WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs
@@ -1,4 +1,5 @@
using Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -68,8 +69,41 @@
            }
        }
        #region è½¦é—´ç®¡ç†  çƒ­å¤„理温度曲线图
        [Route("Cj_NoPassProc/HeatTreatmentTemperatureCurveChart")]
        [HttpGet]
        public object HeatTreatmentTemperatureCurveChart(string sWhere,string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                ds = oCN.RunProcReturn("exec h_p_Cj_HeatTreatmentTemperatureCurveChart '"+ sWhere + "'", "h_p_Cj_HeatTreatmentTemperatureCurveChart");
        //
                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}
WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
@@ -2073,5 +2073,85 @@
        }
        #endregion
        #region å·¥åºå•品过站 å•品过站查询
        [Route("Cj_SingleStation/SingleItemTransitList")]
        [HttpGet]
        public object SingleItemTransitList(string HProcExchBillNo, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                string sql = @"exec h_p_SingleItemTransitList '" + HProcExchBillNo + "'";
                ds = oCN.RunProcReturn(sql, "h_p_SingleItemTransitList");
                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess!";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region å·¥åºå•品过站 å•品过站查询 æŸ¥è¯¢å…·ä½“条码
        [Route("Cj_SingleStation/SingleItemTransit_SN_List")]
        [HttpGet]
        public object SingleItemTransit_SN_List(string sWhere, string TableName)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                string sql = @"exec h_p_SingleItemTransit_SN_List '" + sWhere + "','"+ TableName + "'";
                ds = oCN.RunProcReturn(sql, "h_p_SingleItemTransit_SN_List");
                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess!";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}
WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
@@ -343,35 +343,35 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //ds = oCN.RunProcReturn("exec h_p_MES_StationInBill_QtyCtrl " + HInterID + "", "h_p_MES_StationInBill_QtyCtrl");
                //if (ds == null)
                //{
                //    oCN.RollBack();
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "判断数量失败!";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //if (ds.Tables[0].Rows.Count == 0)
                //{
                //    oCN.RollBack();
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "判断数量失败!";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //if (ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2")
                //{
                //    oCN.RollBack();
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                ds = oCN.RunProcReturn("exec h_p_MES_StationInBill_QtyCtrl " + HInterID + "", "h_p_MES_StationInBill_QtyCtrl");
                if (ds == null)
                {
                    oCN.RollBack();
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "判断数量失败!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (ds.Tables[0].Rows.Count == 0)
                {
                    oCN.RollBack();
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "判断数量失败!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2")
                {
                    oCN.RollBack();
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_In " + HInterID + ",1");
                //判断是否是 é¦–道工序
                ds1 = oCN.RunProcReturn(" select HLastProc,HFstProc from Sc_ProcessExchangeBillMain a  " +
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -277,6 +277,19 @@
                            return objJsonResult;
                        }
                    }
                    //判断当前工单是否开工
                    else if (oSystemParameter.omodel.MES_StationOutBill_MustBeginWorkCtl == "Y")
                    {
                        ds = oCN.RunProcReturn("select * from Sc_ICMOBillStatus_Tmp where HSourceID = '" + HSourceID + "' and HICMOBillNo = '" + HICMOBillNo + "' and HInterID = '" + HICMOInterID + "' and hicmostatus =1", "Sc_ICMOBillStatus_Tmp");
                        if (ds.Tables[0].Rows[0]["HICMOStatus"].ToString() != "1")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "当前工单不是开工状态不能汇报!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                    else {
                        if (HQty + HWasterQty <= 0)
                        {
WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs
@@ -580,6 +580,50 @@
        }
        #endregion
        #region è½¦é—´æ¨¡å—  ç”Ÿäº§æ—¥éœ€æ±‚模具报表  æŸ¥è¯¢
        [Route("Mes_OrderProcFlowAllReport/getSc_MouldRequirementDay")]
        [HttpGet]
        public object getSc_MouldRequirementDay(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Sc_MouldRequirementDay order by æ—¥æœŸ desc", "h_v_Sc_MouldRequirementDay");
                }
                else
                {
                    string sql1 = "select * from h_v_Sc_MouldRequirementDay where 1 = 1 ";
                    string sql = sql1 + sWhere + " order by æ—¥æœŸ ";
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldRequirementDay");
                }
                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess!";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -1986,8 +1986,8 @@
                }
                string[] HInterEntryIDArr = HInterID.Split(',');
                string[] HData;
                DataTable dt = new DataTable();
                for (int i = 0; i < HInterEntryIDArr.Length; i++)
                {
@@ -1997,12 +1997,22 @@
                    ds = oCN.RunProcReturn(sql, "h_p_Sc_ProcessExchange_BatchSplit");
                    if (i == 0)
                    {
                        dt = ds.Tables[0];
                    }
                    else
                    {
                        foreach (DataRow item in ds.Tables[0].Rows)
                        {
                            DataRow dataRow = dt.NewRow();
                            dataRow.ItemArray = item.ItemArray;
                            dt.Rows.Add(dataRow);
                        }
                    }
                }
               
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                if (dt == null || dt.Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -2015,7 +2025,7 @@
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess!";
                    objJsonResult.data = ds.Tables[0];
                    objJsonResult.data = dt;
                    return objJsonResult;
                }
            }
@@ -2030,5 +2040,284 @@
        }
        #endregion
        #region[批量拆分下推-保存按钮]
        /// <summary>
        /// æ–°å¢žå•据-保存按钮
        ///参数:string sql。
        ///返回值:object。
        /// </summary>
        [Route("Sc_ProcessExchangeBill/AddBill_BatchSplit")]
        [HttpPost]
        public object AddBill_BatchSplit([FromBody] JObject sMainSub)
        {
            var _value = sMainSub["sMainSub"].ToString();
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();//明细行信息
            string HUser = sArray[1].ToString();//用户
            string HComputerName = SystemInformation.ComputerName; //设备名称
            string UserName = "";
            ListModels oListModels = new ListModels();
            bool bResult = true;
            try
            {
                if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Edit", 1, false, HUser))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "流转卡无保存权限!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                DAL.ClsSc_ProcessExchangeBill oBill = new DAL.ClsSc_ProcessExchangeBill();
                //表体数据
                //按 },{来拆分数组 //去掉【和】
                msg2 = msg2.Substring(1, msg2.Length - 2);
                msg2 = msg2.Replace("\\", "");
                msg2 = msg2.Replace("\n", "");  //\n
                //msg2 = msg2.Replace("'", "’");
                List<Model.ClsSc_ProcessExchangeBillSub_BatchSplit> ls = new List<Model.ClsSc_ProcessExchangeBillSub_BatchSplit>();
                ls = oListModels.getObjectByJson_Sc_ProcessExchangeBillSub_BatchSplit(msg2);
                DateTime dt = DateTime.Now;
                string sql = "";
                string HBillNo = "";
                Int64 HICMOInterID = 0;
                Int64 HICMOEntryID = 0;
                string HICMOBillNo = "";
                double HQty = 0;
                foreach (Model.ClsSc_ProcessExchangeBillSub_BatchSplit oItemSub in ls)
                {
                    HBillNo = DBUtility.ClsPub.CreateBillCode_Prod("3772", ref DBUtility.ClsPub.sExeReturnInfo, true);
                    HICMOInterID = oItemSub.HICMOInterID;
                    HICMOEntryID = oItemSub.HICMOEntryID;
                    HICMOBillNo = oItemSub.HICMOBillNo;
                    HQty = oItemSub.HQty;
                    sql = "select * from h_v_Sc_ProcessExchangeBill_BatchSplit where hmainid = " + oItemSub.HICMOInterID + " and hentryid = "
                         + oItemSub.HICMOEntryID;
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessExchangeBill_BatchSplit");
                    //主表赋值
                    if (ds.Tables[0].Rows.Count > 0 && ds != null)
                    {
                        oBill.omodel.HBillNo = HBillNo;
                        oBill.omodel.HBillSubType = "3772";
                        oBill.omodel.HMainSourceBillSubType = "3710";
                        oBill.omodel.HDate = oItemSub.HDate;
                        oBill.omodel.HMaker = HUser;
                        oBill.omodel.HMakeDate = System.DateTime.Now.ToString("G");
                        oBill.omodel.HPrevMainSourceInterID = 0;
                        oBill.omodel.HYear = DBUtility.ClsPub.isLong(oItemSub.HDate.Year);
                        oBill.omodel.HPeriod = DBUtility.ClsPub.isLong(oItemSub.HDate.Month);
                        oBill.omodel.HRemark = "";
                        oBill.omodel.HBatchNo = "";
                        oBill.omodel.HMainMaterID = 0;
                        oBill.omodel.HKeyMaterID = 0;
                        oBill.omodel.HNo = 0;
                        oBill.omodel.HOrderProcNO = ds.Tables[0].Rows[0]["HPlanOrderProcNo"].ToString();
                        oBill.omodel.HWWOrderInterID = 0;
                        oBill.omodel.HWWOrderEntryID = 0;
                        oBill.omodel.HWWOrderBillNo = "";
                        oBill.omodel.HEquipMentID = 0; //!
                        oBill.omodel.HICMOBillNo = oItemSub.HICMOBillNo;
                        oBill.omodel.HMaterID = oItemSub.HMaterID;
                        oBill.omodel.HMaterNumber = ds.Tables[0].Rows[0]["HMaterNumber"].ToString();
                        oBill.omodel.HUnitID = Pub_Class.ClsPub.isLong(ds.Tables[0].Rows[0]["HUnitID"]);
                        oBill.omodel.HMateOutBatchNo = "";
                        oBill.omodel.HUnitNumber = ds.Tables[0].Rows[0]["HUnitNumber"].ToString();
                        oBill.omodel.HMaterID2 = oItemSub.HMaterID;
                        oBill.omodel.HProjectNum = "";
                        oBill.omodel.HPlanQty = oItemSub.HQty;
                        oBill.omodel.HQty = oItemSub.HProQty;
                        oBill.omodel.HPlanBeginDate = Convert.ToDateTime(dt.ToShortDateString().ToString());
                        oBill.omodel.HPlanEndDate = Convert.ToDateTime(dt.ToShortDateString().ToString());
                        oBill.omodel.HExplanation = "";
                        oBill.omodel.HInnerBillNo = "";
                        oBill.omodel.HSupID = 0;
                        oBill.omodel.HWorkShopID = Pub_Class.ClsPub.isLong(ds.Tables[0].Rows[0]["HDeptID"]);
                        oBill.omodel.HWorkTypeNum = "";
                        oBill.omodel.HProdMaterCode = "";
                        oBill.omodel.HSeOrderBillNo = ds.Tables[0].Rows[0]["HSeOrderBillNo"].ToString();
                        oBill.omodel.HCusShortName = "";
                        oBill.omodel.HCusNeedMaterial = "";
                        oBill.omodel.HPlanSendGoodsDate = dt.ToShortDateString().ToString();
                        oBill.omodel.HProdMaterName = "";
                        oBill.omodel.HCusName = "";
                        oBill.omodel.HWorkRemark = "";
                        oBill.omodel.HImportNote = "";
                        oBill.omodel.HMaterNumber_A = "";
                        oBill.omodel.HMaterNumber_B = "";
                        oBill.omodel.HMaterNumber_C = "";
                        oBill.omodel.HMaterNumber_D = "";
                        oBill.omodel.HProdType = "";
                        oBill.omodel.HMaterShortName = "";
                        oBill.omodel.HMaterIDA = "";
                        oBill.omodel.HMaterIDB = "";
                        oBill.omodel.HMaterIDC = "";
                        oBill.omodel.HMaterIDD = "";
                        oBill.omodel.HICMOInterID = oItemSub.HICMOInterID;
                        oBill.omodel.HICMOEntryID = oItemSub.HICMOEntryID;
                        oBill.omodel.HPicNumVer = "";
                        oBill.omodel.HPicNumAssemble = "";
                        oBill.omodel.HMaterTexture = "";
                        oBill.omodel.HProductNum = "";
                        oBill.omodel.HVerNum = "";
                        oBill.omodel.HPRDORGID = Pub_Class.ClsPub.isLong(ds.Tables[0].Rows[0]["HPRDORGID"]);
                        oBill.omodel.HBLFlag = false;
                        oBill.omodel.HCusNumber = "";
                        oBill.omodel.HPickLabel = "";
                        oBill.omodel.HPickLabelNumber = "";
                        oBill.omodel.HXTNumber = "";
                        oBill.omodel.HXTModel = "";
                        oBill.omodel.HWorkBillSortNo = "";//!
                        oBill.omodel.HRoutingBillID = oItemSub.HRoutingInterID.ToString();
                        oBill.omodel.HMaterModel = ds.Tables[0].Rows[0]["HMaterModel"].ToString();
                        oBill.omodel.HWidth = 0;
                        oBill.omodel.HWeight = 0;
                        oBill.omodel.HAuxQty = 0;
                        oBill.omodel.HAuxUnit = 0;
                        oBill.omodel.HAuxQty2 = 0;
                        oBill.omodel.HAuxUnit2 = 0;
                        oBill.omodel.HSplitNo = 0;
                        oBill.omodel.HHeight = "";
                        oBill.omodel.HInches = "";
                        oBill.omodel.HAl1Long = "";
                        oBill.omodel.HDensity = "";
                        oBill.omodel.HTela = "";
                        oBill.omodel.HUnderTela = "";
                        oBill.omodel.HSizing = "";
                        oBill.omodel.HSellDate = dt.ToShortDateString().ToString();
                        oBill.omodel.HRemark2 = "批量拆分下推";
                        oBill.omodel.HRemark3 = "";
                        oBill.omodel.HEmpID = 0;
                        oBill.omodel.HCusID = 0;
                        oBill.omodel.HColorRemark = "";
                        oBill.omodel.HSplitSumQty = 0;
                        oBill.omodel.HSplitColorQty = 0;
                        oBill.omodel.HMachineLine = "";
                        oBill.omodel.HMainSourceInterID = 0;
                        oBill.omodel.HMainSourceEntryID = 0;
                        oBill.omodel.HMainSourceBillNo = "";
                        oBill.omodel.HOrderLevID = 0;
                        oBill.omodel.HWidth_New = 0;
                        oBill.omodel.HRemark_New = "";
                        oBill.omodel.HWeight_New = 0;
                        oBill.omodel.HPlanOrderProcNo = ds.Tables[0].Rows[0]["HPlanOrderProcNo"].ToString();
                        oBill.omodel.HMouldNum = "0";
                    }
                    //子表赋值
                    for(int i = 0; i < ds.Tables[0].Rows.Count; i++)
                    {
                        Model.ClsSc_ProcessExchangeBillSub oItemSubs = new Model.ClsSc_ProcessExchangeBillSub();
                        oItemSubs.HEntryID = i + 1;
                        oItemSubs.HBillNo_bak = HBillNo;
                        oItemSubs.HCloseMan = "";
                        oItemSubs.HEntryCloseDate = Convert.ToDateTime(dt.ToShortDateString().ToString());
                        oItemSubs.HCloseType = false;
                        oItemSubs.HRemark = "";
                        oItemSubs.HSourceInterID = HICMOInterID;
                        oItemSubs.HSourceEntryID = HICMOEntryID;
                        oItemSubs.HSourceBillNo = HICMOBillNo;
                        oItemSubs.HSourceBillType = "3710";
                        oItemSubs.HRelationQty = 0;
                        oItemSubs.HRelationMoney = 0;
                        oItemSubs.HRelationQty_In = 0;
                        oItemSubs.HRelationQty_Out = 0;
                        oItemSubs.HRelationQty_WWOrder = 0;
                        oItemSubs.HRelationQty_Bad = 0;
                        oItemSubs.HProcNo = Pub_Class.ClsPub.isLong(ds.Tables[0].Rows[i]["HProcNo"]);
                        oItemSubs.HProcID = Pub_Class.ClsPub.isLong(ds.Tables[0].Rows[i]["HProcID"]);
                        oItemSubs.HProcNumber = ds.Tables[0].Rows[i]["HProcNumber"].ToString();
                        oItemSubs.HWorkRemark = "";
                        oItemSubs.HCenterID = Pub_Class.ClsPub.isLong(ds.Tables[0].Rows[i]["HCenterID"]);
                        oItemSubs.HDeptID = Pub_Class.ClsPub.isLong(ds.Tables[0].Rows[i]["HDeptID"]);
                        oItemSubs.HDeptNumber = ds.Tables[0].Rows[i]["HDeptNumber"].ToString();
                        oItemSubs.HGroupID = 0;
                        oItemSubs.HGroupNumber = "";
                        oItemSubs.HWorkerID = 0;
                        oItemSubs.HWorkerNumber = "";
                        oItemSubs.HSourceID = 0;
                        oItemSubs.HQty = HQty;
                        oItemSubs.HTimeUnit = "";
                        oItemSubs.HPlanWorkTimes = 0;
                        oItemSubs.HPlanBeginDate = Convert.ToDateTime(dt.ToShortDateString().ToString());
                        oItemSubs.HPlanEndDate = Convert.ToDateTime(dt.ToShortDateString().ToString());
                        oItemSubs.HRelBeginDate = Convert.ToDateTime(dt.ToShortDateString().ToString());
                        oItemSubs.HRelEndDate = Convert.ToDateTime(dt.ToShortDateString().ToString());
                        oItemSubs.HReadyTime = 0;
                        oItemSubs.HQueueTime = 0;
                        oItemSubs.HMoveTime = 0;
                        oItemSubs.HBeginDayQty = 0;
                        oItemSubs.HBeginFixQty = 0;
                        oItemSubs.HFixWorkDays = 0;
                        oItemSubs.HTrunWorkDays = 0;
                        oItemSubs.HReadyTimes = 0;
                        oItemSubs.HMyWorkDays = 0;
                        oItemSubs.HOutPrice = 0;
                        oItemSubs.HOutMoney = 0;
                        oItemSubs.HPassRate = 0;
                        oItemSubs.HLastProc = "";
                        oItemSubs.HKeyProc = "";
                        oItemSubs.HFstProc = "";
                        oItemSubs.HICMOInterID = HICMOInterID;
                        oItemSubs.HICMOBillNo = HICMOBillNo;
                        oItemSubs.HWWOrderInterID = 0;
                        oItemSubs.HWWOrderEntryID = 0;
                        oItemSubs.HWWOrderBillNo = "";
                        oItemSubs.HReportQty = 0;
                        oItemSubs.HBackProc = false;
                        oItemSubs.HSupID = 0;
                        oItemSubs.HSupFlag = false;
                        oItemSubs.HOverRate = 0;
                        oItemSubs.HMaxQty = 0;
                        oItemSubs.HTechnologyParameter = "";
                        oItemSubs.HProcCheckNote = "";
                        oItemSubs.HPicNum = "";
                        oItemSubs.HMouldNo = "";
                        oItemSubs.HProcWorkNum = "";
                        oItemSubs.HSeOrderInterID = 0;
                        oItemSubs.HSeOrderEntryID = 0;
                        oItemSubs.HSNCtrl = false;
                        oBill.DetailColl.Add(oItemSubs);//添加明细行值
                    }
                    //调用保存方法
                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                    oBill.DetailColl.Clear();//清空明细行值
                    if (!bResult)
                    {
                        break;
                    }
                }
                if (bResult)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "保存成功!";
                    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
    }
}
WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs
@@ -15,6 +15,7 @@
    public class SB_EquipICMOTechParamBillController : ApiController
    {
        public DBUtility.ClsPub.Enum_BillStatus BillStatus;
        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
        public const string ModName = "3919";                   //单据类型
        public const string ModCaption = "设备工艺参数订单点检表";          //单据名称
        public const string ModRightName = "SB_EquipICMOTechParamBill";
@@ -739,8 +740,26 @@
                    oBill.DetailColl.Add(oItemSub);
                }
                //保存
                bool bResult;
                //获取系统参数
                string Ret = "";
                if (oSystemParameter.ShowBill(ref Ret))
                {
                    if (oSystemParameter.omodel.SB_EquipICMOTechParamBill_MustBeginWorkCtl == "Y")
                    {
                        ds = oCn.RunProcReturn("select * from Sc_ICMOBillStatus_Tmp where HSourceID = '" + oBill.omodel.HSourceID + "' and HSourceBillNo = '" + oBill.omodel.HProcExchBillNo + "' and HSourceInterID = '" + oBill.omodel.HProcExchInterID + "'and HSourceEntryID = '" + oBill.omodel.HProcExchEntryID + "' and hicmostatus =1", "Sc_ICMOBillStatus_Tmp");
                        if (ds.Tables[0].Rows[0]["HICMOStatus"].ToString() != "1")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "当前工单不是开工状态不能进行设备工艺参数点检!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }
                    //保存
                    bool bResult;
                if (OperationType == "1")   //新增保存
                {
                    bResult = oBill.AddBill (ref DBUtility.ClsPub.sExeReturnInfo);
WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
@@ -944,7 +944,14 @@
        {
            try
            {
                ds = new SQLHelper.ClsCN().RunProcReturn("select * from Sc_ICMOBillStatus_Tmp" + sWhere, "Sc_ICMOBillStatus_Tmp");
                Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
                string HSourceID = dic["HSourceID"].ToString();
                string HICMOBillNo = dic["HICMOBillNo"].ToString();
                string HInterID = dic["HInterID"].ToString();
                string Type = dic["type"].ToString();
                ds = new SQLHelper.ClsCN().RunProcReturn("exec h_p_IpadIndexButton  '"+ HSourceID + "','" + HICMOBillNo + "','" + HInterID + "','" + Type + "'", "h_p_IpadIndexButton");
                if (ds.Tables[0].Rows.Count > 0)
                {
                    objJsonResult.code = "1";
WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
@@ -2925,7 +2925,7 @@
                {
                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                    _ = SendDingDingAsync(oBill.omodel.HSendMan, 1, oBill.omodel.HDescription, oBill.omodel.HReceiveMan);
                    _ = SendDingDingAsync(oBill.omodel.HSendMan, 2, oBill.omodel.HDescription, oBill.omodel.HReceiveMan);
                }
                else if (refSav == "Update")
                {
@@ -6653,7 +6653,7 @@
            }
            if (HHandleEmpID==0) //异常反馈验收单保存  å°†æ¶ˆæ¯ å‘送给 æŽ¥æ”¶äººï¼ŒæŒ‡æ´¾å¤„理人,全部抄送人
            if (HHandleEmpID==0) //
            {
                string HReceiveMan = HSendMan;
                string[] names = HCopyMan.Split(',');
@@ -6674,13 +6674,14 @@
                }
                concatenatedNames = string.Join(",", HNames);
                HDescription = HDescription + "--已验收";
            }
            else if (HHandleEmpID==1)//异常反馈签到单,异常反馈处理单  å°†æ¶ˆæ¯ å‘送给 å‘送人,接收人
            else if (HHandleEmpID==1)//异常反馈处理单  å°†æ¶ˆæ¯ å‘送给 å‘送人,接收人
            {
                //获取发送人  æŽ¥æ”¶äºº
                string HReceiveMan = HCopyMan;
                string sql1 = "select HDingDingUserID é’‰é’‰id from Gy_Czygl where Czymc in ('" + HSendMan + "','" + HReceiveMan + "')";
                ds = oCN.RunProcReturn(sql1, "Gy_Czygl");
                ds = oCN.RunProcReturn(sql1, "Gy_Czygl");
                List<string> HNames = new List<string>();
                for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
                {
@@ -6689,16 +6690,13 @@
                }
                concatenatedNames = string.Join(",", HNames);
                HDescription = HDescription + "--已签到";
            }
            else
            else if (HHandleEmpID == 2)//异常反馈处理单  å°†æ¶ˆæ¯ å‘送给 å‘送人,接收人
            {
                //查询指派处理人
                string sql = "select HName from Gy_Employee where HItemID='" + HHandleEmpID + "'";
                ds = oCN.RunProcReturn(sql, "Gy_Employee");
                string HHandleEmpName = ds.Tables[0].Rows[0]["HName"].ToString();
                //获取指派处理人,发送人的钉钉id
                string sql1 = "select HDingDingUserID é’‰é’‰id from Gy_Czygl where Czymc in ('" + HSendMan + "','" + HHandleEmpName + "')";
                LogService.CustomWriteLog("10参数" + sql1, "异常罚款");
                //获取发送人  æŽ¥æ”¶äºº
                string HReceiveMan = HCopyMan;
                string sql1 = "select HDingDingUserID é’‰é’‰id from Gy_Czygl where Czymc in ('" + HSendMan + "','" + HReceiveMan + "')";
                ds = oCN.RunProcReturn(sql1, "Gy_Czygl");
                List<string> HNames = new List<string>();
                for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
@@ -6708,7 +6706,26 @@
                }
                concatenatedNames = string.Join(",", HNames);
                LogService.CustomWriteLog("9参数" + concatenatedNames, "异常罚款");
                HDescription = HDescription + "--已处理";
            }
            else
            {
                //查询指派处理人
                string sql = "select HName from Gy_Employee where HItemID='" + HHandleEmpID + "'";
                ds = oCN.RunProcReturn(sql, "Gy_Employee");
                string HHandleEmpName = ds.Tables[0].Rows[0]["HName"].ToString();
                //获取指派处理人,发送人的钉钉id
                string sql1 = "select HDingDingUserID é’‰é’‰id from Gy_Czygl where Czymc in ('" + HSendMan + "','" + HHandleEmpName + "')";
                ds = oCN.RunProcReturn(sql1, "Gy_Czygl");
                List<string> HNames = new List<string>();
                for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
                {
                    string HName = ds.Tables[0].Rows[i]["钉钉id"].ToString();
                    HNames.Add(HName);
                }
                concatenatedNames = string.Join(",", HNames);
                HDescription = HDescription + "--已接收";
            }
          
            //获取企业的access_token的值
@@ -6788,7 +6805,8 @@
            {
                List<object> columnNameList = new List<object>();
                string sql = "select a.HSourceBillNo æµè½¬å¡å·,a.HSourceBillType æµè½¬å¡ç±»åž‹,a.HSourceInterID æµè½¬å¡ä¸»å†…码,a.HSourceEntryID æµè½¬å¡å­å†…码,b.HNumber ç‰©æ–™ä»£ç ,b.HName ç‰©æ–™åç§°,b.HModel è§„格型号,a.HPlanQty è®¡åˆ’数量 from Sc_ICMOBillStatus_Tmp a left join Gy_Material b on a.HMaterID=b.HItemID where HSourceBillNo='" + HSourceBill + "'";
                string sql = "select a.HSourceBillNo æµè½¬å¡å·,a.HSourceBillType æµè½¬å¡ç±»åž‹,a.HSourceInterID æµè½¬å¡ä¸»å†…码,a.HSourceEntryID æµè½¬å¡å­å†…码,b.HNumber ç‰©æ–™ä»£ç ,b.HName ç‰©æ–™åç§°,b.HModel è§„格型号,a.HPlanQty è®¡åˆ’数量,a.HSourceID,c.HName ç”Ÿäº§èµ„源 from Sc_ICMOBillStatus_Tmp a " +
                    "left join Gy_Material b on a.HMaterID=b.HItemID  left join Gy_Source c on a.HSourceID=c.HItemID where HSourceBillNo='" + HSourceBill + "'";
                ds = oCN.RunProcReturn(sql, "Sc_ICMOBillStatus_Tmp");
                //添加列名
WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs
@@ -393,6 +393,14 @@
                oCN.BeginTran();
                ds = oCN.RunProcReturn("select * from h_v_YS_ReceiveBillList where hmainid=" + HInterID, "h_v_YS_ReceiveBillList");
                string hSourceBillType = ds.Tables[0].Rows[0]["源单类型"].ToString();
                if (hSourceBillType == "1426")
                {
                    //收款单 åˆ é™¤å›žå¡« åº”付单关联数量
                    oCN.RunProc("exec h_p_Xs_UpDateRelation_ReceiveToReceivableIn_Del " + HInterID);
                }
                oCN.RunProc("delete from YS_ReceiveBillMain where HInterID = " + HInterID);
                oCN.RunProc("delete from YS_ReceiveBillSub where HInterID= " + HInterID);
WebAPI/Controllers/Æ·ÖʹÜÀí/Ѳ¼ìµ¥/QC_PatrolProcCheckOtherBillController.cs
@@ -229,7 +229,7 @@
                        oSub.HUpOffSet= DBUtility.ClsPub.isStrNull(subList[i].HUpOffSet);
                        oSub.HDownOffSet= DBUtility.ClsPub.isStrNull(subList[i].HDownOffSet);
                        oSub.HAnalysisMethod = DBUtility.ClsPub.isStrNull(subList[i].HAnalysisMethod);
                        oSub.HKeyInspect = DBUtility.ClsPub.isLong(subList[i].HKeyInspect);
                        oSub.HKeyInspect = DBUtility.ClsPub.isBool(subList[i].HKeyInspect);
                        oSub.HInspectInstruMentID = DBUtility.ClsPub.isLong(subList[i].HInspectInstruMentID);
                        oSub.HInspectResult = DBUtility.ClsPub.isStrNull(subList[i].HResult);
                        BillNew.DetailColl.Add(oSub);
@@ -1240,7 +1240,7 @@
                        oSub.HUpOffSet = DBUtility.ClsPub.isStrNull(subList[i].HUpOffSet);
                        oSub.HDownOffSet = DBUtility.ClsPub.isStrNull(subList[i].HDownOffSet);
                        oSub.HAnalysisMethod = DBUtility.ClsPub.isStrNull(subList[i].HAnalysisMethod);
                        oSub.HKeyInspect = DBUtility.ClsPub.isLong(subList[i].HKeyInspect);
                        oSub.HKeyInspect = DBUtility.ClsPub.isBool(subList[i].HKeyInspect);
                        oSub.HInspectInstruMentID = DBUtility.ClsPub.isLong(subList[i].HInspectInstruMentID);
                        oSub.HInspectResult = DBUtility.ClsPub.isStrNull(subList[i].HResult == "True" ? 1 : 0);
WebAPI/Controllers/Æ·ÖʹÜÀí/ÖÊÁ¿±¨±í/QC_QualityReportsController.cs
@@ -1427,5 +1427,87 @@
        }
        #endregion
        #region è´¨é‡æ¨¡å— åˆ¶ç¨‹é™·é˜±æµ‹è¯•趋势图报表
        /// <summary>
        /// åˆ¶ç¨‹é™·é˜±æµ‹è¯•趋势图报表
        /// </summary>
        /// <returns></returns>
        [Route("QC_QualityReportsController/GetQC_SkillExamMonthSumReport_Json")]
        [HttpGet]
        public object GetQC_SkillExamMonthSumReport_Json(Int64 HYear, Int64 HDeptID)
        {
            try
            {
                ds = oCN.RunProcReturn("exec h_p_QC_SkillExamMonthSumReport '" + HYear.ToString() + "'," + HDeptID.ToString(), "h_p_QC_SkillExamMonthSumReport");
                List<object> columnNameList = new List<object>();
                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));  //获取到DataColumn列对象的列名
                }
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "成功!";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
                //}
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "返回报表信息失败!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region è´¨é‡æ¨¡å— PPM绩效趋势图报表
        /// <summary>
        /// PPM绩效趋势图报表
        /// </summary>
        /// <returns></returns>
        [Route("QC_QualityReportsController/GetQC_PPMReport_Json")]
        [HttpGet]
        public object GetQC_PPMReport_Json(Int64 HYear, Int64 HDeptID)
        {
            try
            {
                ds = oCN.RunProcReturn("exec h_p_QC_PPMReport '" + HYear.ToString() + "'," + HDeptID.ToString(), "h_p_QC_PPMReport");
                List<object> columnNameList = new List<object>();
                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));  //获取到DataColumn列对象的列名
                }
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "成功!";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
                //}
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "返回报表信息失败!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}
WebAPI/Controllers/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_UnitConvertRateController.cs
@@ -181,7 +181,8 @@
                            FormId = "BD_UNITCONVERTRATE",
                            FieldKeys = "FUNITCONVERTRATEID,FBILLNO,FMATERIALID,FUSEORGID,FCREATEORGID,FFORBIDSTATUS" +
                            ",FCURRENTUNITID,FDESTUNITID,FCONVERTTYPE,FCONVERTNUMERATOR,FCONVERTDENOMINATOR" +
                            ",FCREATORID,FCREATEDATE,FMODIFIERID,FMODIFYDATE,FAPPROVERID,FAPPROVEDATE,FFORBIDDERID,FFORBIDDATE",
                            ",FCREATORID,FCREATEDATE,FMODIFIERID,FMODIFYDATE,FAPPROVERID,FAPPROVEDATE,FFORBIDDERID,FFORBIDDATE" +
                            ",FMATERIALID.FNUMBER",
                            FilterString = "",
                            OrderString = "",
                            TopRowCount = 0,
@@ -245,6 +246,7 @@
                                HModifyTime = DBUtility.ClsPub.isDate(arr[i, 14]),
                                HStopEmp = DBUtility.ClsPub.isStrNull(arr[i, 17]),
                                HStopTime = DBUtility.ClsPub.isDate(arr[i, 18]),
                                HMaterNumber = DBUtility.ClsPub.isStrNull(arr[i, 19]),
                            };
                            //写入单位换算表数据
@@ -253,7 +255,7 @@
                                    (HItemID,HNumber,HName,HShortNumber,HParentID,HLevel
                                    ,HEndFlag,HStopflag,HRemark,HUseFlag,HUSEORGID,HCREATEORGID
                                    ,HBILLNO,HMATERID,HCURRENTUNITID,HDESTUNITID,HCONVERTTYPE,HCONVERTNUMERATOR
                                    ,HCONVERTDENOMINATOR,HFORBIDSTATUS,HUnitID
                                    ,HCONVERTDENOMINATOR,HFORBIDSTATUS,HUnitID,HMaterNumber
                                    ,HMakeEmp,HMakeTime
                                    ,HCheckEmp,HCheckTime
                                    ,HModifyEmp,HModifyTime
@@ -261,7 +263,7 @@
                                    Values({subData.HItemID},'{subData.HNumber}','{subData.HName}','{subData.HShortNumber}',{subData.HParentID},{subData.HLevel}
                                    ,{subData.HEndFlag},{subData.HStopflag},'{subData.HRemark}','{subData.HUseFlag}',{subData.HUSEORGID},{subData.HCREATEORGID}
                                    ,'{subData.HBILLNO}',{subData.HMATERID},{subData.HCURRENTUNITID},{subData.HDESTUNITID},{subData.HCONVERTTYPE},{subData.HCONVERTNUMERATOR}
                                    ,{subData.HCONVERTDENOMINATOR},'{subData.HFORBIDSTATUS}',{subData.HUnitID}
                                    ,{subData.HCONVERTDENOMINATOR},'{subData.HFORBIDSTATUS}',{subData.HUnitID},'{subData.HMaterNumber}'
                                    ,'{subData.HMakeEmp}',case when '{subData.HMakeTime}' = '1900/1/1 0:00:00' then NULL else '{subData.HMakeTime}' end
                                    ,'{subData.HCheckEmp}',case when '{subData.HCheckTime}' = '1900/1/1 0:00:00' then NULL else '{subData.HCheckTime}' end
                                    ,'{subData.HModifyEmp}',case when '{subData.HModifyTime}' = '1900/1/1 0:00:00' then NULL else '{subData.HModifyTime}' end
WebAPI/Controllers/¹¤×ʹÜÀí/HR_EmployeeSkillExamBillController.cs
@@ -230,8 +230,8 @@
                    oItem.HBillType = "2332";
                    oItem.HBillSubType = "2332";
                    oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                    oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
                    oItem.HYear = DBUtility.ClsPub.isLong(oItem.HDate.Year);
                    oItem.HPeriod = DBUtility.ClsPub.isLong(oItem.HDate.Month);
                    oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
                    if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
WebAPI/Controllers/Êý¾Ýͬ²½/¶¤¶¤Í¬²½/DD_DataSynchronizationController.cs
@@ -397,7 +397,7 @@
                //OriginatorId = "12",                                                                                          //根据流程发起人工号查询。
                //TaskId = "12",                                                                                                //任务ID。
                CreateFromTimeGMT = DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd"),                                          //创建时间起始值。
                CreateFromTimeGMT = DateTime.Now.ToString("dd") == "01"?"2022-01-01":DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd"),                                          //创建时间起始值。
                CreateToTimeGMT = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"),                                               //创建时间终止值。
                PageSize = pageSize,                                                  //分页大小。
@@ -1492,6 +1492,9 @@
                        return false;
                    }
                    string[] studyLevelList = new string[] {"","高中","中专","大专","本科","","","其他","初中","小学" };
                    for (int i = 0; i < response.Result.Count; i++)
                    {
                        List<string> fieldNameList = new List<string>();
@@ -1522,6 +1525,15 @@
                            {
                                int index = fieldNameList.IndexOf("学历");
                                oItem.HStudyLevel = response.Result[i].FieldDataList[index].FieldValueList[0].Value;
                                if (oItem.HStudyLevel != null && oItem.HStudyLevel != "")
                                {
                                    long studyLevelIndex = DBUtility.ClsPub.isLong(oItem.HStudyLevel);
                                    if (studyLevelIndex >= studyLevelList.Length)
                                    {
                                        studyLevelIndex = 0;
                                    }
                                    oItem.HStudyLevel = studyLevelList[studyLevelIndex];
                                }
                            }
                            if (fieldNameList.IndexOf("部门") >= 0)
WebAPI/ListModels.cs
@@ -836,6 +836,18 @@
        }
        /// <summary>
        /// å¤„理新增工序流转卡子表2的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsSc_ProcessExchangeBillSub_BatchSplit> getObjectByJson_Sc_ProcessExchangeBillSub_BatchSplit(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSc_ProcessExchangeBillSub_BatchSplit> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcessExchangeBillSub_BatchSplit>>(jsonString);
            return list;
        }
        /// <summary>
        /// å¤„理新增出站汇报单主表的json
        /// </summary>
        /// <param name="jsonString"></param>
WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user
@@ -4,147 +4,174 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <History>True|2024-06-08T04:38:30.4153773Z;True|2024-06-07T21:22:19.4545597+08:00;True|2024-06-07T21:05:53.1963741+08:00;True|2024-06-07T21:00:57.2568708+08:00;True|2024-06-07T14:39:19.6618679+08:00;True|2024-06-07T14:21:51.5169962+08:00;True|2024-06-07T11:29:08.0690999+08:00;True|2024-06-07T11:26:29.1494329+08:00;True|2024-06-07T11:20:41.2024309+08:00;True|2024-06-07T10:12:26.5905597+08:00;False|2024-06-07T10:11:35.3679434+08:00;</History>
    <History>True|2024-08-23T01:28:59.6852470Z;False|2024-08-23T09:28:05.1857669+08:00;True|2024-08-22T09:38:03.7896560+08:00;True|2024-06-08T12:38:30.4153773+08:00;True|2024-06-07T21:22:19.4545597+08:00;True|2024-06-07T21:05:53.1963741+08:00;True|2024-06-07T21:00:57.2568708+08:00;True|2024-06-07T14:39:19.6618679+08:00;True|2024-06-07T14:21:51.5169962+08:00;True|2024-06-07T11:29:08.0690999+08:00;True|2024-06-07T11:26:29.1494329+08:00;True|2024-06-07T11:20:41.2024309+08:00;True|2024-06-07T10:12:26.5905597+08:00;False|2024-06-07T10:11:35.3679434+08:00;</History>
    <_PublishTargetUrl>D:\网站发布\智云MESWMS\API</_PublishTargetUrl>
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.EndpointUtil.dll">
      <publishTime>04/07/2020 16:33:48</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.GatewayDingTalk.dll">
      <publishTime>04/25/2023 17:49:04</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.GatewaySpi.dll">
      <publishTime>07/31/2024 20:50:30</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.OpenApiClient.dll">
      <publishTime>08/06/2024 18:07:52</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.OpenApiUtil.dll">
      <publishTime>11/22/2022 11:24:18</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.SDK.Dingtalk.dll">
      <publishTime>08/08/2024 19:43:22</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.TeaUtil.dll">
      <publishTime>07/15/2024 20:25:56</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.TeaXML.dll">
      <publishTime>08/03/2022 21:46:08</publishTime>
    </File>
    <File Include="bin/Aliyun.Credentials.dll">
      <publishTime>07/24/2024 10:36:58</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>06/08/2024 12:38:12</publishTime>
      <publishTime>08/22/2024 09:37:54</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>06/08/2024 12:38:12</publishTime>
      <publishTime>08/22/2024 09:37:54</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
      <publishTime>12/17/2020 21:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>06/08/2024 12:38:10</publishTime>
      <publishTime>08/22/2024 09:37:52</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>06/08/2024 12:38:10</publishTime>
      <publishTime>08/22/2024 09:37:52</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>06/08/2024 12:38:08</publishTime>
      <publishTime>08/19/2024 08:52:30</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>06/08/2024 12:38:08</publishTime>
      <publishTime>08/19/2024 08:52:30</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
      <publishTime>03/22/2022 05:17:26</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.pdb">
      <publishTime>03/19/2022 07:39:42</publishTime>
      <publishTime>03/18/2022 23:39:42</publishTime>
    </File>
    <File Include="bin/Grpc.Core.dll">
      <publishTime>03/22/2022 13:17:20</publishTime>
      <publishTime>03/22/2022 05:17:20</publishTime>
    </File>
    <File Include="bin/Grpc.Core.pdb">
      <publishTime>03/19/2022 07:39:48</publishTime>
      <publishTime>03/18/2022 23:39:48</publishTime>
    </File>
    <File Include="bin/grpc_csharp_ext.x64.dll">
      <publishTime>03/22/2022 13:17:22</publishTime>
      <publishTime>03/22/2022 05:17:22</publishTime>
    </File>
    <File Include="bin/grpc_csharp_ext.x86.dll">
      <publishTime>03/22/2022 13:17:22</publishTime>
      <publishTime>03/22/2022 05:17:22</publishTime>
    </File>
    <File Include="bin/ICSharpCode.SharpZipLib.dll">
      <publishTime>05/09/2021 01:08:30</publishTime>
      <publishTime>05/08/2021 17:08:30</publishTime>
    </File>
    <File Include="bin/ICSharpCode.SharpZipLib.pdb">
      <publishTime>05/09/2021 01:08:30</publishTime>
      <publishTime>05/08/2021 17:08:30</publishTime>
    </File>
    <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>02/09/2023 20:21:24</publishTime>
    </File>
    <File Include="bin/libgrpc_csharp_ext.x64.dylib">
      <publishTime>03/19/2022 07:38:44</publishTime>
      <publishTime>03/18/2022 23:38:44</publishTime>
    </File>
    <File Include="bin/libgrpc_csharp_ext.x64.so">
      <publishTime>03/19/2022 07:38:42</publishTime>
      <publishTime>03/18/2022 23:38:42</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>06/08/2024 12:38:08</publishTime>
      <publishTime>08/22/2024 09:37:49</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>06/08/2024 12:38:08</publishTime>
      <publishTime>08/22/2024 09:37:49</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="bin/Newtonsoft.Json.dll">
      <publishTime>08/04/2014 04:33:56</publishTime>
      <publishTime>03/08/2023 15:09:56</publishTime>
    </File>
    <File Include="bin/NPOI.dll">
      <publishTime>10/23/2021 09:07:54</publishTime>
      <publishTime>10/23/2021 01:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.OOXML.dll">
      <publishTime>10/23/2021 09:07:56</publishTime>
      <publishTime>10/23/2021 01:07:56</publishTime>
    </File>
    <File Include="bin/NPOI.OOXML.pdb">
      <publishTime>10/23/2021 17:07:56</publishTime>
      <publishTime>10/23/2021 09:07:56</publishTime>
    </File>
    <File Include="bin/NPOI.OpenXml4Net.dll">
      <publishTime>10/23/2021 09:07:54</publishTime>
      <publishTime>10/23/2021 01:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.OpenXml4Net.pdb">
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.OpenXmlFormats.dll">
      <publishTime>10/23/2021 09:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.OpenXmlFormats.dll">
      <publishTime>10/23/2021 01:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.OpenXmlFormats.pdb">
      <publishTime>10/23/2021 17:07:54</publishTime>
      <publishTime>10/23/2021 09:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.pdb">
      <publishTime>10/23/2021 17:07:54</publishTime>
      <publishTime>10/23/2021 09:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>06/08/2024 12:38:04</publishTime>
      <publishTime>08/19/2024 08:52:29</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>06/08/2024 12:38:04</publishTime>
      <publishTime>08/19/2024 08:52:29</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>06/08/2024 12:38:06</publishTime>
      <publishTime>08/19/2024 08:52:29</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>06/08/2024 12:38:06</publishTime>
      <publishTime>08/19/2024 08:52:29</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
      <publishTime>08/30/2012 22:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>06/08/2024 12:38:07</publishTime>
      <publishTime>08/19/2024 08:52:29</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>06/08/2024 12:38:07</publishTime>
      <publishTime>08/19/2024 08:52:29</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.Buffers.dll">
      <publishTime>07/19/2017 18:01:28</publishTime>
      <publishTime>07/19/2017 10:01:28</publishTime>
    </File>
    <File Include="bin/System.ComponentModel.DataAnnotations.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
@@ -168,19 +195,25 @@
      <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.Memory.dll">
      <publishTime>04/18/2019 00:24:34</publishTime>
      <publishTime>04/17/2019 16:24: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.Extensions.dll">
      <publishTime>02/20/2015 04:10:46</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.Net.Http.Primitives.dll">
      <publishTime>02/20/2015 04:10:46</publishTime>
    </File>
    <File Include="bin/System.Runtime.CompilerServices.Unsafe.dll">
      <publishTime>09/19/2018 03:38:10</publishTime>
      <publishTime>09/18/2018 19:38:10</publishTime>
    </File>
    <File Include="bin/System.Runtime.Serialization.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
@@ -189,7 +222,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>
@@ -204,37 +237,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>05/25/2024 09:46:41</publishTime>
      <publishTime>08/19/2021 09:44:01</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>
@@ -242,17 +275,26 @@
    <File Include="bin/System.Xml.Linq.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/Tea.dll">
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>08/23/2024 09:26:48</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>08/23/2024 09:26:48</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>06/08/2024 12:38:18</publishTime>
      <publishTime>08/23/2024 09:28:53</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>06/08/2024 12:38:18</publishTime>
      <publishTime>08/23/2024 09:28:53</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>
@@ -261,190 +303,190 @@
      <publishTime>11/29/2018 21:26:30</publishTime>
    </File>
    <File Include="Config/kdapi.config">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>07/12/2024 16:38:23</publishTime>
    </File>
    <File Include="Content/bootstrap.css">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="Content/bootstrap.min.css">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="Content/Site.css">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="DLL/BLL.dll">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="DLL/DAL.dll">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>11/01/2021 09:26:33</publishTime>
    </File>
    <File Include="DLL/DBUtility.dll">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>02/09/2023 20:21:24</publishTime>
    </File>
    <File Include="DLL/Model.dll">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="DLL/Newtonsoft.Json.Net35.dll">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="DLL/Pub_Class.dll">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="DLL/Pub_Control.dll">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="DLL/SQLHelper.dll">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.eot">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.svg">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.ttf">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.woff">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="Global.asax">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="grpc_csharp_ext.x64.dll">
      <publishTime>03/22/2022 13:17:22</publishTime>
      <publishTime>03/22/2022 05:17:22</publishTime>
    </File>
    <File Include="grpc_csharp_ext.x86.dll">
      <publishTime>03/22/2022 13:17:22</publishTime>
      <publishTime>03/22/2022 05:17:22</publishTime>
    </File>
    <File Include="Index.html">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="libgrpc_csharp_ext.x64.dylib">
      <publishTime>03/19/2022 07:38:44</publishTime>
      <publishTime>03/18/2022 23:38:44</publishTime>
    </File>
    <File Include="libgrpc_csharp_ext.x64.so">
      <publishTime>03/19/2022 07:38:42</publishTime>
      <publishTime>03/18/2022 23:38:42</publishTime>
    </File>
    <File Include="libman.json">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>07/17/2023 13:22:30</publishTime>
    </File>
    <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="packages.config">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>08/21/2024 16:12:07</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.js">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.min.js">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.js">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.js">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.map">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.js">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.min.js">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="Views/Scripts/modernizr-2.6.2.js">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="Views/Shared/Error.cshtml">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="Views/Shared/_Layout.cshtml">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="Views/web.config">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="Views/_ViewStart.cshtml">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>08/19/2021 09:44:01</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>04/28/2024 15:55:22</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>04/28/2024 15:55:21</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>04/28/2024 15:55:23</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>04/28/2024 15:55:22</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>04/28/2024 15:55:22</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>04/28/2024 15:55:22</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>04/28/2024 15:55:23</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>04/28/2024 15:55:26</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>04/28/2024 15:55:26</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>04/28/2024 15:55:25</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>04/28/2024 15:55:24</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>04/28/2024 15:55:25</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>04/28/2024 15:55:24</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>04/28/2024 15:55:23</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>04/28/2024 15:55:26</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>04/28/2024 15:55:24</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>04/28/2024 15:55:25</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>04/28/2024 15:55:24</publishTime>
    </File>
    <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>04/28/2024 15:55:26</publishTime>
    </File>
    <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>04/28/2024 15:55:27</publishTime>
    </File>
    <File Include="Web References/WebS/Reference.map">
      <publishTime>05/25/2024 09:46:41</publishTime>
      <publishTime>04/28/2024 15:55:16</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>06/08/2024 12:38:29</publishTime>
      <publishTime>08/22/2024 09:38:00</publishTime>
    </File>
  </ItemGroup>
</Project>
WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml
File was deleted
WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml.user
File was deleted
WebAPI/Properties/PublishProfiles/FolderProfile12.pubxml
File was deleted
WebAPI/Properties/PublishProfiles/FolderProfile12.pubxml.user
File was deleted
WebAPI/Properties/PublishProfiles/FolderProfile13.pubxml
File was deleted
WebAPI/Properties/PublishProfiles/FolderProfile13.pubxml.user
File was deleted
WebAPI/Properties/PublishProfiles/FolderProfile14.pubxml
File was deleted
WebAPI/Properties/PublishProfiles/FolderProfile14.pubxml.user
File was deleted
WebAPI/Properties/PublishProfiles/FolderProfile15.pubxml
File was deleted
WebAPI/Properties/PublishProfiles/FolderProfile15.pubxml.user
File was deleted
WebAPI/Properties/PublishProfiles/FolderProfile16.pubxml
File was deleted
WebAPI/Properties/PublishProfiles/FolderProfile16.pubxml.user
File was deleted
WebAPI/Properties/PublishProfiles/FolderProfile17.pubxml
File was deleted
WebAPI/Properties/PublishProfiles/FolderProfile17.pubxml.user
File was deleted
WebAPI/Properties/PublishProfiles/FolderProfile18.pubxml
File was deleted
WebAPI/Properties/PublishProfiles/FolderProfile18.pubxml.user
File was deleted
WebAPI/Properties/PublishProfiles/FolderProfile19.pubxml
File was deleted
WebAPI/Properties/PublishProfiles/FolderProfile19.pubxml.user
File was deleted
WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml
File was deleted
WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
File was deleted
WebAPI/Properties/PublishProfiles/FolderProfile20.pubxml
File was deleted
WebAPI/Properties/PublishProfiles/FolderProfile20.pubxml.user
File was deleted
WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml
@@ -4,13 +4,21 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
<<<<<<< HEAD
    <DeleteExistingFiles>False</DeleteExistingFiles>
=======
    <DeleteExistingFiles>True</DeleteExistingFiles>
>>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
    <ExcludeApp_Data>False</ExcludeApp_Data>
    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
    <LastUsedPlatform>Any CPU</LastUsedPlatform>
    <PublishProvider>FileSystem</PublishProvider>
<<<<<<< HEAD
    <PublishUrl>D:\网站发布\API</PublishUrl>
=======
    <PublishUrl>G:\issWeb\网站发布\API</PublishUrl>
>>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
    <WebPublishMethod>FileSystem</WebPublishMethod>
  </PropertyGroup>
</Project>
WebAPI/Properties/PublishProfiles/FolderProfile21.pubxml.user
@@ -4,12 +4,21 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
<<<<<<< HEAD
    <_PublishTargetUrl>D:\网站发布\API</_PublishTargetUrl>
    <History>True|2024-08-23T02:19:36.3998566Z;False|2024-08-23T10:19:11.7322045+08:00;True|2024-08-22T15:00:00.6272300+08:00;True|2024-08-22T14:23:56.2431121+08:00;True|2024-08-22T14:21:07.8891099+08:00;True|2024-08-22T14:16:16.8593691+08:00;True|2024-08-22T14:10:54.9485086+08:00;False|2024-08-22T14:10:34.3992110+08:00;True|2024-08-22T13:59:37.0535963+08:00;False|2024-08-22T13:59:18.1850177+08:00;True|2024-08-22T10:34:18.4560987+08:00;True|2024-08-22T10:32:54.8825393+08:00;False|2024-08-22T10:32:23.3647548+08:00;True|2024-08-21T09:11:59.9409596+08:00;</History>
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
      <publishTime>04/06/2023 15:57:04</publishTime>
=======
    <History>True|2024-08-22T05:54:00.8671096Z;True|2024-08-22T13:51:47.3774868+08:00;True|2024-08-22T11:08:16.6367044+08:00;False|2024-08-22T11:08:06.3321501+08:00;True|2024-08-22T10:54:44.9493185+08:00;False|2024-08-22T10:54:36.6051798+08:00;True|2024-08-21T16:59:42.2314838+08:00;True|2024-08-21T16:15:39.3970105+08:00;True|2024-08-21T16:15:21.1951828+08:00;False|2024-08-21T16:15:00.1718456+08:00;True|2024-08-21T15:52:14.1734637+08:00;True|2024-08-21T15:51:10.6106267+08:00;False|2024-08-21T15:50:05.7560087+08:00;True|2024-08-21T14:26:54.6150600+08:00;True|2024-08-21T10:36:07.4567215+08:00;True|2024-08-21T10:09:07.9820150+08:00;True|2024-08-21T10:08:57.7601146+08:00;False|2024-08-21T10:08:41.4637507+08:00;True|2024-08-19T15:51:06.3264524+08:00;True|2024-08-19T11:32:14.9720932+08:00;True|2024-07-17T13:18:07.5448501+08:00;True|2024-07-17T12:53:35.8246446+08:00;True|2024-07-17T10:34:20.6073593+08:00;True|2024-07-17T09:54:04.5489967+08:00;True|2024-07-16T16:30:18.3627034+08:00;True|2024-07-15T18:25:56.8513970+08:00;True|2024-07-15T18:09:06.8846250+08:00;True|2024-07-15T16:43:30.5405561+08:00;True|2024-07-15T15:21:21.1227016+08:00;True|2024-07-15T15:17:39.9283465+08:00;True|2024-07-15T14:54:11.3495767+08:00;True|2024-07-15T13:59:09.4243337+08:00;True|2024-07-15T13:54:34.1993714+08:00;True|2024-07-15T13:50:18.8921152+08:00;True|2024-07-15T13:48:52.6793990+08:00;True|2024-07-15T13:41:38.7896562+08:00;True|2024-07-15T12:07:43.8834464+08:00;True|2024-07-15T12:03:36.2859286+08:00;True|2024-07-15T11:31:11.9462854+08:00;True|2024-07-12T11:12:48.2429052+08:00;True|2024-07-12T11:00:40.3954752+08:00;True|2024-07-12T10:59:20.7895441+08:00;True|2024-07-12T10:23:59.9903863+08:00;True|2024-07-12T10:23:38.3456675+08:00;False|2024-07-11T20:05:30.6369108+08:00;False|2024-07-11T20:04:21.0285923+08:00;</History>
    <_PublishTargetUrl>D:\网站发布\智云MESWMS\API</_PublishTargetUrl>
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
      <publishTime>05/25/2024 09:46:41</publishTime>
>>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
    </File>
    <File Include="bin/AlibabaCloud.EndpointUtil.dll">
      <publishTime>04/07/2020 16:33:48</publishTime>
@@ -45,28 +54,49 @@
      <publishTime>02/22/2013 16:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
<<<<<<< HEAD
      <publishTime>08/21/2024 09:11:46</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>08/21/2024 09:11:46</publishTime>
=======
      <publishTime>08/22/2024 13:53:48</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>08/22/2024 13:53:48</publishTime>
>>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
<<<<<<< HEAD
      <publishTime>08/21/2024 09:11:44</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>08/21/2024 09:11:44</publishTime>
=======
      <publishTime>08/22/2024 13:53:47</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>08/22/2024 13:53:47</publishTime>
>>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
<<<<<<< HEAD
      <publishTime>08/21/2024 09:11:40</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>08/21/2024 09:11:40</publishTime>
=======
      <publishTime>08/22/2024 13:53:45</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>08/22/2024 13:53:45</publishTime>
>>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 13:17:26</publishTime>
@@ -93,7 +123,11 @@
      <publishTime>05/09/2021 01:08:30</publishTime>
    </File>
    <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
<<<<<<< HEAD
      <publishTime>04/06/2023 15:57:04</publishTime>
=======
      <publishTime>05/25/2024 09:46:41</publishTime>
>>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
    </File>
    <File Include="bin/libgrpc_csharp_ext.x64.dylib">
      <publishTime>03/19/2022 07:38:44</publishTime>
@@ -111,6 +145,7 @@
      <publishTime>07/25/2012 19:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
<<<<<<< HEAD
      <publishTime>08/21/2024 09:11:41</publishTime>
    </File>
    <File Include="bin/Model.pdb">
@@ -118,6 +153,15 @@
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>04/06/2023 15:57:04</publishTime>
=======
      <publishTime>08/22/2024 13:53:45</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>08/22/2024 13:53:45</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>05/25/2024 09:46:41</publishTime>
>>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
    </File>
    <File Include="bin/Newtonsoft.Json.dll">
      <publishTime>03/08/2023 15:09:56</publishTime>
@@ -147,6 +191,7 @@
      <publishTime>10/23/2021 17:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
<<<<<<< HEAD
      <publishTime>08/21/2024 09:11:38</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
@@ -157,15 +202,34 @@
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>08/21/2024 09:11:39</publishTime>
=======
      <publishTime>08/22/2024 13:53:43</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>08/22/2024 13:53:43</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>08/22/2024 13:53:44</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>08/22/2024 13:53:44</publishTime>
>>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
<<<<<<< HEAD
      <publishTime>08/21/2024 09:11:39</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>08/21/2024 09:11:39</publishTime>
=======
      <publishTime>08/22/2024 13:53:44</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>08/22/2024 13:53:44</publishTime>
>>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
@@ -246,7 +310,11 @@
      <publishTime>11/28/2018 21:01:00</publishTime>
    </File>
    <File Include="bin/System.Web.Http.WebHost.dll">
<<<<<<< HEAD
      <publishTime>04/06/2023 15:57:04</publishTime>
=======
      <publishTime>05/25/2024 09:46:41</publishTime>
>>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
    </File>
    <File Include="bin/System.Web.Mvc.dll">
      <publishTime>01/28/2015 12:02:18</publishTime>
@@ -279,15 +347,23 @@
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
<<<<<<< HEAD
      <publishTime>08/20/2024 16:45:27</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>08/20/2024 16:45:27</publishTime>
=======
      <publishTime>08/21/2024 16:02:12</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>08/21/2024 16:02:14</publishTime>
>>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
<<<<<<< HEAD
      <publishTime>08/23/2024 10:19:28</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
@@ -295,6 +371,12 @@
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>08/23/2024 10:19:32</publishTime>
=======
      <publishTime>08/22/2024 13:53:53</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>08/22/2024 13:53:53</publishTime>
>>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
@@ -306,6 +388,7 @@
      <publishTime>11/29/2018 21:26:30</publishTime>
    </File>
    <File Include="Config/kdapi.config">
<<<<<<< HEAD
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Content/bootstrap.css">
@@ -358,6 +441,60 @@
    </File>
    <File Include="Global.asax">
      <publishTime>04/06/2023 15:57:04</publishTime>
=======
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Content/bootstrap.css">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Content/bootstrap.min.css">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Content/Site.css">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="DLL/BLL.dll">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="DLL/DAL.dll">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="DLL/DBUtility.dll">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="DLL/Model.dll">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="DLL/Newtonsoft.Json.Net35.dll">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="DLL/Pub_Class.dll">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="DLL/Pub_Control.dll">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="DLL/SQLHelper.dll">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.eot">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.svg">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.ttf">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.woff">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Global.asax">
      <publishTime>05/25/2024 09:46:41</publishTime>
>>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
    </File>
    <File Include="grpc_csharp_ext.x64.dll">
      <publishTime>03/22/2022 13:17:22</publishTime>
@@ -366,7 +503,11 @@
      <publishTime>03/22/2022 13:17:22</publishTime>
    </File>
    <File Include="Index.html">
<<<<<<< HEAD
      <publishTime>04/06/2023 15:57:04</publishTime>
=======
      <publishTime>05/25/2024 09:46:41</publishTime>
>>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
    </File>
    <File Include="libgrpc_csharp_ext.x64.dylib">
      <publishTime>03/19/2022 07:38:44</publishTime>
@@ -375,6 +516,7 @@
      <publishTime>03/19/2022 07:38:42</publishTime>
    </File>
    <File Include="libman.json">
<<<<<<< HEAD
      <publishTime>07/12/2023 08:14:22</publishTime>
    </File>
    <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
@@ -490,6 +632,123 @@
    </File>
    <File Include="Web.config">
      <publishTime>08/21/2024 09:11:58</publishTime>
=======
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="packages.config">
      <publishTime>08/16/2024 09:07:08</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.js">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.min.js">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.js">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.js">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.map">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.js">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.min.js">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Views/Scripts/modernizr-2.6.2.js">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Views/Shared/Error.cshtml">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Views/Shared/_Layout.cshtml">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Views/web.config">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Views/_ViewStart.cshtml">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web References/WebS/Reference.map">
      <publishTime>05/25/2024 09:46:41</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>08/22/2024 13:53:59</publishTime>
>>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
    </File>
  </ItemGroup>
</Project>
WebAPI/Properties/PublishProfiles/FolderProfile3.pubxml
File was deleted
WebAPI/Properties/PublishProfiles/FolderProfile3.pubxml.user
File was deleted
WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml
File was deleted
WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml.user
File was deleted
WebAPI/Properties/PublishProfiles/FolderProfile5.pubxml
File was deleted
WebAPI/Properties/PublishProfiles/FolderProfile5.pubxml.user
File was deleted
WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml
File was deleted
WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user
File was deleted
WebAPI/Properties/PublishProfiles/FolderProfile7.pubxml
File was deleted
WebAPI/Properties/PublishProfiles/FolderProfile7.pubxml.user
File was deleted
WebAPI/Properties/PublishProfiles/FolderProfile8.pubxml
File was deleted
WebAPI/Properties/PublishProfiles/FolderProfile8.pubxml.user
File was deleted
WebAPI/Properties/PublishProfiles/FolderProfile9.pubxml
File was deleted
WebAPI/Properties/PublishProfiles/FolderProfile9.pubxml.user
File was deleted
WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user
@@ -5,10 +5,38 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <_PublishTargetUrl>D:\网站发布\智云MESWMS\API</_PublishTargetUrl>
    <History>True|2024-08-22T03:12:48.4249984Z;</History>
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>09/05/2022 17:03:11</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.EndpointUtil.dll">
      <publishTime>04/07/2020 08:33:48</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.GatewayDingTalk.dll">
      <publishTime>04/25/2023 09:49:04</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.GatewaySpi.dll">
      <publishTime>07/31/2024 12:50:30</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.OpenApiClient.dll">
      <publishTime>08/06/2024 10:07:52</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.OpenApiUtil.dll">
      <publishTime>11/22/2022 03:24:18</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.SDK.Dingtalk.dll">
      <publishTime>08/08/2024 11:43:22</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.TeaUtil.dll">
      <publishTime>07/15/2024 12:25:56</publishTime>
    </File>
    <File Include="bin/AlibabaCloud.TeaXML.dll">
      <publishTime>08/03/2022 13:46:08</publishTime>
    </File>
    <File Include="bin/Aliyun.Credentials.dll">
      <publishTime>07/24/2024 02:36:58</publishTime>
    </File>
    <File Include="bin/Antlr3.Runtime.dll">
      <publishTime>02/22/2013 08:43:40</publishTime>
@@ -17,19 +45,61 @@
      <publishTime>02/22/2013 08:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>08/22/2024 11:06:06</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>08/22/2024 11:06:06</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/17/2020 21:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>06/25/2021 16:26:52</publishTime>
      <publishTime>08/22/2024 11:06:03</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>08/22/2024 11:06:03</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 14:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>08/22/2024 11:05:59</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>08/22/2024 11:05:59</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.dll">
      <publishTime>03/22/2022 05:17:26</publishTime>
    </File>
    <File Include="bin/Grpc.Core.Api.pdb">
      <publishTime>03/18/2022 23:39:42</publishTime>
    </File>
    <File Include="bin/Grpc.Core.dll">
      <publishTime>03/22/2022 05:17:20</publishTime>
    </File>
    <File Include="bin/Grpc.Core.pdb">
      <publishTime>03/18/2022 23:39:48</publishTime>
    </File>
    <File Include="bin/grpc_csharp_ext.x64.dll">
      <publishTime>03/22/2022 05:17:22</publishTime>
    </File>
    <File Include="bin/grpc_csharp_ext.x86.dll">
      <publishTime>03/22/2022 05:17:22</publishTime>
    </File>
    <File Include="bin/ICSharpCode.SharpZipLib.dll">
      <publishTime>05/08/2021 17:08:30</publishTime>
    </File>
    <File Include="bin/ICSharpCode.SharpZipLib.pdb">
      <publishTime>05/08/2021 17:08:30</publishTime>
    </File>
    <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>02/08/2023 09:18:13</publishTime>
    </File>
    <File Include="bin/libgrpc_csharp_ext.x64.dylib">
      <publishTime>03/18/2022 23:38:44</publishTime>
    </File>
    <File Include="bin/libgrpc_csharp_ext.x64.so">
      <publishTime>03/18/2022 23:38:42</publishTime>
    </File>
    <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
      <publishTime>03/18/2015 17:02:50</publishTime>
@@ -41,22 +111,67 @@
      <publishTime>07/25/2012 11:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>06/17/2021 23:18:55</publishTime>
      <publishTime>08/22/2024 11:06:00</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>08/22/2024 11:06:00</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>09/05/2022 17:03:10</publishTime>
    </File>
    <File Include="bin/Newtonsoft.Json.dll">
      <publishTime>08/03/2014 20:33:56</publishTime>
      <publishTime>03/08/2023 07:09:56</publishTime>
    </File>
    <File Include="bin/NPOI.dll">
      <publishTime>10/23/2021 01:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.OOXML.dll">
      <publishTime>10/23/2021 01:07:56</publishTime>
    </File>
    <File Include="bin/NPOI.OOXML.pdb">
      <publishTime>10/23/2021 09:07:56</publishTime>
    </File>
    <File Include="bin/NPOI.OpenXml4Net.dll">
      <publishTime>10/23/2021 01:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.OpenXml4Net.pdb">
      <publishTime>10/23/2021 09:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.OpenXmlFormats.dll">
      <publishTime>10/23/2021 01:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.OpenXmlFormats.pdb">
      <publishTime>10/23/2021 09:07:54</publishTime>
    </File>
    <File Include="bin/NPOI.pdb">
      <publishTime>10/23/2021 09:07:54</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>05/21/2020 10:51:50</publishTime>
      <publishTime>08/22/2024 11:05:56</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>08/22/2024 11:05:56</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>08/22/2024 11:05:57</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>08/22/2024 11:05:57</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/30/2012 22:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>08/22/2024 11:05:58</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>08/22/2024 11:05:58</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/15/2015 17:57:08</publishTime>
    </File>
    <File Include="bin/System.Buffers.dll">
      <publishTime>07/19/2017 10:01:28</publishTime>
    </File>
    <File Include="bin/System.ComponentModel.DataAnnotations.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
@@ -82,11 +197,23 @@
    <File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
      <publishTime>08/19/2014 10:03:34</publishTime>
    </File>
    <File Include="bin/System.Memory.dll">
      <publishTime>04/17/2019 16:24: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.Extensions.dll">
      <publishTime>02/19/2015 20:10:46</publishTime>
    </File>
    <File Include="bin/System.Net.Http.Formatting.dll">
      <publishTime>11/28/2018 13:00:36</publishTime>
    </File>
    <File Include="bin/System.Net.Http.Primitives.dll">
      <publishTime>02/19/2015 20:10:46</publishTime>
    </File>
    <File Include="bin/System.Runtime.CompilerServices.Unsafe.dll">
      <publishTime>09/18/2018 19:38:10</publishTime>
    </File>
    <File Include="bin/System.Runtime.Serialization.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
@@ -119,7 +246,7 @@
      <publishTime>11/28/2018 13:01:00</publishTime>
    </File>
    <File Include="bin/System.Web.Http.WebHost.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>09/05/2022 17:03:08</publishTime>
    </File>
    <File Include="bin/System.Web.Mvc.dll">
      <publishTime>01/28/2015 04:02:18</publishTime>
@@ -148,14 +275,23 @@
    <File Include="bin/System.Xml.Linq.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/Tea.dll">
      <publishTime>05/09/2023 02:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>08/22/2024 11:05:59</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>08/22/2024 11:05:59</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 11:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>06/28/2021 10:34:31</publishTime>
      <publishTime>08/22/2024 11:06:14</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>06/28/2021 10:34:31</publishTime>
      <publishTime>08/22/2024 11:06:14</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/17/2013 17:03:52</publishTime>
@@ -166,164 +302,191 @@
    <File Include="bin/zh-Hans/System.Web.Http.resources.dll">
      <publishTime>11/29/2018 13:26:30</publishTime>
    </File>
    <File Include="Config/kdapi.config">
      <publishTime>11/27/2023 09:14:13</publishTime>
    </File>
    <File Include="Content/bootstrap.css">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>09/05/2022 17:02:53</publishTime>
    </File>
    <File Include="Content/bootstrap.min.css">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>09/05/2022 17:02:53</publishTime>
    </File>
    <File Include="Content/Site.css">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>09/05/2022 17:02:53</publishTime>
    </File>
    <File Include="DLL/BLL.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>09/05/2022 17:03:02</publishTime>
    </File>
    <File Include="DLL/DAL.dll">
      <publishTime>06/25/2021 16:26:52</publishTime>
      <publishTime>09/05/2022 17:03:06</publishTime>
    </File>
    <File Include="DLL/DBUtility.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>09/05/2022 17:03:07</publishTime>
    </File>
    <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>02/08/2023 09:18:13</publishTime>
    </File>
    <File Include="DLL/Model.dll">
      <publishTime>06/17/2021 23:18:55</publishTime>
      <publishTime>09/05/2022 17:03:07</publishTime>
    </File>
    <File Include="DLL/Newtonsoft.Json.Net35.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>09/05/2022 17:03:07</publishTime>
    </File>
    <File Include="DLL/Pub_Class.dll">
      <publishTime>05/21/2020 10:51:50</publishTime>
      <publishTime>09/05/2022 17:03:07</publishTime>
    </File>
    <File Include="DLL/Pub_Control.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>09/05/2022 17:03:08</publishTime>
    </File>
    <File Include="DLL/SQLHelper.dll">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>09/05/2022 17:03:08</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.eot">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>09/05/2022 17:03:11</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.svg">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>09/05/2022 17:03:11</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.ttf">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>09/05/2022 17:03:11</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.woff">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>09/05/2022 17:03:11</publishTime>
    </File>
    <File Include="Global.asax">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>01/10/2023 17:20:14</publishTime>
    </File>
    <File Include="grpc_csharp_ext.x64.dll">
      <publishTime>03/22/2022 05:17:22</publishTime>
    </File>
    <File Include="grpc_csharp_ext.x86.dll">
      <publishTime>03/22/2022 05:17:22</publishTime>
    </File>
    <File Include="Index.html">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>09/05/2022 17:03:09</publishTime>
    </File>
    <File Include="libgrpc_csharp_ext.x64.dylib">
      <publishTime>03/18/2022 23:38:44</publishTime>
    </File>
    <File Include="libgrpc_csharp_ext.x64.so">
      <publishTime>03/18/2022 23:38:42</publishTime>
    </File>
    <File Include="libman.json">
      <publishTime>07/24/2023 08:56:46</publishTime>
    </File>
    <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>09/05/2022 17:03:09</publishTime>
    </File>
    <File Include="packages.config">
      <publishTime>01/21/2021 13:19:40</publishTime>
      <publishTime>08/15/2024 22:03:48</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.js">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>09/05/2022 17:03:10</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.min.js">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>09/05/2022 17:03:10</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.js">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>09/05/2022 17:03:11</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.js">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>09/05/2022 17:03:11</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.map">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>09/05/2022 17:03:11</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.js">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>09/05/2022 17:03:11</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.min.js">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>09/05/2022 17:03:11</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>09/05/2022 17:03:11</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>09/05/2022 17:03:11</publishTime>
    </File>
    <File Include="Views/Scripts/modernizr-2.6.2.js">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>09/05/2022 17:03:11</publishTime>
    </File>
    <File Include="Views/Shared/Error.cshtml">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>09/05/2022 17:03:11</publishTime>
    </File>
    <File Include="Views/Shared/_Layout.cshtml">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>09/05/2022 17:03:11</publishTime>
    </File>
    <File Include="Views/web.config">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>09/05/2022 17:03:11</publishTime>
    </File>
    <File Include="Views/_ViewStart.cshtml">
      <publishTime>01/13/2021 21:47:30</publishTime>
      <publishTime>09/05/2022 17:03:11</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>01/24/2024 11:35:25</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>01/24/2024 11:35:25</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>01/24/2024 11:35:25</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>01/24/2024 11:35:25</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>01/24/2024 11:35:25</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>01/24/2024 11:35:25</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>01/24/2024 11:35:25</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
      <publishTime>01/24/2024 11:35:26</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
      <publishTime>02/22/2021 09:25:21</publishTime>
      <publishTime>01/24/2024 11:35:26</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>01/24/2024 11:35:26</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>01/24/2024 11:35:25</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
      <publishTime>02/22/2021 09:25:21</publishTime>
      <publishTime>01/24/2024 11:35:26</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>01/24/2024 11:35:26</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>01/24/2024 11:35:25</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
      <publishTime>02/22/2021 09:25:21</publishTime>
      <publishTime>01/24/2024 11:35:26</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>01/24/2024 11:35:26</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
      <publishTime>02/22/2021 09:25:21</publishTime>
      <publishTime>01/24/2024 11:35:26</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>01/24/2024 11:35:25</publishTime>
    </File>
    <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
      <publishTime>01/24/2024 11:35:26</publishTime>
    </File>
    <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
      <publishTime>02/22/2021 09:25:20</publishTime>
      <publishTime>01/24/2024 11:35:25</publishTime>
    </File>
    <File Include="Web References/WebS/Reference.map">
      <publishTime>05/06/2024 08:56:50</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>06/28/2021 10:34:52</publishTime>
      <publishTime>08/22/2024 11:12:47</publishTime>
    </File>
  </ItemGroup>
</Project>
WebAPI/Web.config
@@ -22,7 +22,7 @@
        <!--<add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>-->
        <!--<add key="FileIP" value="http://localhost:8080/" />-->
        <!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/>    -->
        <!--<add key="sUrl" value="http://192.168.0.11/WEBS-WMS/WebService1.asmx"/>--><!--颜台式机-->
        <add key="sUrl" value="http://192.168.0.11/WEBS-WMS/WebService1.asmx" /><!--颜台式机-->
        <!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> å¤å®-->
        <!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> -->
        <!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/>    åšæ—¥ç§‘技-->
@@ -35,7 +35,7 @@
        <!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/> -->    <!--测试服务器-->
        <!--<add key="surl" value="http://localhost:8082/webs/webservice1.asmx"/>    æœ¬åœ°-->
        <!--<add key="sUrl" value="http://192.168.110.57:81/WEBS/WebService1.asmx"/>-->    <!--陈雯静本地配置-->
        <add key="surl" value="http://localhost/webs-web/webservice1.asmx"/>    <!--翁涛涛本地配置-->
        <!--<add key="surl" value="http://localhost/webs-web/webservice1.asmx"/>-->    <!--翁涛涛本地配置-->
        <!--<add key="sUrl" value="http://192.168.1.57:8082/WEBS-WMS/WebService1.asmx"/>九菱-->
        <!--<add key="sUrl" value="http://61.130.182.102:18181/WEBSCS/WebService1.asmx"/>--><!--斯莫尔-->
        
WebAPI/WebAPI.csproj.user
@@ -9,8 +9,13 @@
    <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<<<<<<< HEAD
    <NameOfLastUsedPublishProfile>D:\vs\项目代码\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile21.pubxml</NameOfLastUsedPublishProfile>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
=======
    <NameOfLastUsedPublishProfile>D:\GIT仓库\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile10.pubxml</NameOfLastUsedPublishProfile>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
>>>>>>> 626324c6aac0ace48aeb6e7dc72b4ce49d9b240a
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
Binary files differ
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
Binary files differ
sdk_dingding/TopSdk/bin/Release/TopSdk.dll
Binary files differ
sdk_dingding/TopSdk/bin/Release/TopSdk.pdb
Binary files differ
sdk_dingding/TopSdk/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
Binary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -1,30 +1,6 @@
D:\网站发布\测试\钉钉测试\测试项目2\sdk_dingding\topSDK\bin\Debug\TopSdk.dll
D:\网站发布\测试\钉钉测试\测试项目2\sdk_dingding\topSDK\bin\Debug\TopSdk.pdb
D:\网站发布\测试\钉钉测试\测试项目2\sdk_dingding\topSDK\obj\Debug\TopSdk.csproj.AssemblyReference.cache
D:\网站发布\测试\钉钉测试\测试项目2\sdk_dingding\topSDK\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\网站发布\测试\钉钉测试\测试项目2\sdk_dingding\topSDK\obj\Debug\TopSdk.dll
D:\网站发布\测试\钉钉测试\测试项目2\sdk_dingding\topSDK\obj\Debug\TopSdk.pdb
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
<<<<<<< HEAD
D:\vs\项目代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
D:\vs\项目代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
D:\vs\项目代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\vs\项目代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\vs\项目代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
D:\vs\项目代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
=======
D:\智云LMes\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
D:\智云LMes\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
D:\智云LMes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\智云LMes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\智云LMes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
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.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
>>>>>>> 5c681da4317f7267921689c0015a89d07dffdc23
D:\GIT仓库\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
D:\GIT仓库\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
D:\GIT仓库\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
D:\GIT仓库\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\GIT仓库\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\GIT仓库\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
sdk_dingding/TopSdk/obj/Debug/TopSdk.csprojAssemblyReference.cache
Binary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
Binary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache
File was deleted
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
@@ -1,6 +1,6 @@
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
D:\GIT仓库\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
D:\GIT仓库\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
D:\GIT仓库\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache
D:\GIT仓库\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
D:\GIT仓库\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
D:\GIT仓库\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
sdk_dingding/TopSdk/obj/Release/TopSdk.dll
Binary files differ
sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
Binary files differ