合并

ch

2023-03-03 5216d4fd3f01e4dc9a77231e9ab7f118f189e5f3

 WebTM/WebTM.csproj

@@ -45,6 +45,7 @@
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\..\..\办公\K3Cloud\WebSite\bin\Newtonsoft.Json.dll</HintPath>
    </Reference>
    <Reference Include="System.ServiceModel.Web" />
    <Reference Include="System.Web.DynamicData" />
    <Reference Include="System.Web.Entity" />
    <Reference Include="System.Web.ApplicationServices" />
@@ -65,6 +66,7 @@
  <ItemGroup>
    <Content Include="HtmlPage1.html" />
    <Content Include="layuiadmin\echarts.min.js" />
    <Content Include="layuiadmin\grwebapp.js" />
    <Content Include="layuiadmin\layui\css\global.css" />
    <Content Include="layuiadmin\layui\css\layui - 复制.css" />
    <Content Include="layuiadmin\layui\css\modules\layim\html\getmsg.json" />
@@ -161,14 +163,18 @@
    <Content Include="views\PublicPage\PeopleInformations.html" />
    <Content Include="views\PublicPage\PeopleInformation.html" />
    <Content Include="views\PublicPage\PowerInformation.html" />
    <Content Include="views\PublicPage\ProcessInformation.html" />
    <Content Include="views\PublicPage\PurchOrder.html" />
    <Content Include="views\PublicPage\HSourceReportHtml.html" />
    <Content Include="views\PublicPage\transfer.html" />
    <Content Include="views\ReportHtml.html" />
    <Content Include="views\test\testRenderAutomationList.html" />
    <Content Include="views\userfiles\images\loginBackground-New.jpg" />
    <Content Include="views\user\login_anrui.html" />
    <Content Include="views\video\1.wav" />
    <Content Include="views\video\jingbao.wav" />
    <Content Include="views\video\success.wav" />
    <Content Include="views\车间管理\工序流转卡\WindowPrint.html" />
    <Content Include="views\仓存管理\仓库调拨\Kf_MoveStockBill_CheckList_New.html" />
    <Content Include="views\仓存管理\仓库调拨\Kf_MoveStockBill_Check_New.html" />
    <Content Include="views\仓存管理\仓库调拨\Kf_ARPD.html" />
@@ -218,6 +224,8 @@
    <Content Include="views\基础资料\基础资料\Gy_SettleStyleEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_Staff.html" />
    <Content Include="views\基础资料\基础资料\Gy_StaffEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_TaxMIX.html" />
    <Content Include="views\基础资料\基础资料\Gy_TaxMIXEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_TaxRateEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_TaxRateList.html" />
    <Content Include="views\基础资料\基础资料\Gy_RecConditionList.html" />
@@ -290,6 +298,7 @@
    <Content Include="views\grf\cabinet-CG.grf" />
    <Content Include="views\grf\瑞与祺江苏打印模板.grf" />
    <Content Include="views\grf\cabinet-SB.grf" />
    <Content Include="views\grf\ces5.grf" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>
@@ -901,6 +910,8 @@
    <Content Include="views\模治具管理\模治具管理\KF_BarCodeStatusChangeBillList.html" />
    <Content Include="views\模治具管理\模治具管理\Sb_Add_MouldRepairWorkBillList.html" />
    <Content Include="views\生产工序管理\工序汇报单\Sc_ProcessReportList_Last.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserProcess.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBill_Mul.html" />
    <Content Include="views\系统管理\单据类型\Xt_BillSubTypeList.html" />
    <Content Include="views\系统管理\单据类型\Xt_BillSubType_Edit.html" />
    <Content Include="views\设备管理\设备入库检验验收单\Sb_EquipStockInCheckBillEdit.html" />
@@ -1135,11 +1146,15 @@
    <Content Include="views\车间管理\工序出站汇报单\Sc_StationOutBill_Mul_PDA.html" />
    <Content Include="views\车间管理\工序出站汇报单\Sc_StationOutBill_Mul.html" />
    <Content Include="views\车间管理\工序出站汇报单\Cj_StationOutBillList.html" />
    <Content Include="views\车间管理\工序流转\MES_StationInBill_PDA.html" />
    <Content Include="views\车间管理\工序流转\MES_StationOutBill_PDA.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBill_CF.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangePlanDate.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeIssue.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBill.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeIssueBillList.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcExchWorkBackBillEdit.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcExchWorkBackBillList.html" />
    <Content Include="views\车间管理\工序进站接收单\Cj_StationInBill.html" />
    <Content Include="views\车间管理\工序进站接收单\Cj_StationInBillList.html" />
    <Content Include="views\车间管理\工序进站接收单\Cj_StationQty.html" />
@@ -1237,10 +1252,10 @@
    <Content Include="views\车间管理\委外工序接收单\Cj_StationEntrustOutBillList.html" />
    <Content Include="views\车间管理\工序流转\MES_StationInBill.html" />
    <Content Include="views\车间管理\工序流转\MES_StationInBillList.html" />
    <Content Include="views\车间管理\工序流转\MES_StationInBill_PDA.html" />
    <Content Include="views\车间管理\工序流转\MES_StationInBill_PDA_OLD.html" />
    <Content Include="views\车间管理\工序流转\MES_StationOutBill.html" />
    <Content Include="views\车间管理\工序流转\MES_StationOutBillList.html" />
    <Content Include="views\车间管理\工序流转\MES_StationOutBill_PDA.html" />
    <Content Include="views\车间管理\工序流转\MES_StationOutBill_PDA_OLD.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBillList.html" />
    <Content Include="views\车间管理\报表分析\Qk_OutProcessList.html" />
    <Content Include="views\车间管理\报表分析\Sc_ProductionProcessDetailsReport.html" />