合并

yusijie

2023-04-16 22ae2a27d1f66c6acbb126fdbd3d1446b6837acb

 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" />
@@ -64,9 +65,19 @@
  </ItemGroup>
  <ItemGroup>
    <Content Include="HtmlPage1.html" />
    <Content Include="layuiadmin\ax\ax-response.css" />
    <Content Include="layuiadmin\ax\ax.css" />
    <Content Include="layuiadmin\ax\ax.min.js" />
    <Content Include="layuiadmin\ax\images\login-bg.jpg" />
    <Content Include="layuiadmin\ax\images\login-left.jpg" />
    <Content Include="layuiadmin\ax\images\yanzhengma.jpg" />
    <Content Include="layuiadmin\ax\main.css" />
    <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\layui_AllHeight.css" />
    <Content Include="layuiadmin\layui\css\layui_TableHeight.css" />
    <Content Include="layuiadmin\layui\css\modules\layim\html\getmsg.json" />
    <Content Include="layuiadmin\layui\css\ReportPlatform.css" />
    <Content Include="layuiadmin\layui\css\zgqlayui.css" />
@@ -99,6 +110,7 @@
    <Content Include="layuiadmin\PubCustom.js" />
    <Content Include="layuiadmin\PubJs\PubCheck.js" />
    <Content Include="views\Baseset\HBarPlanPrint.html" />
    <Content Include="views\Baseset\SRM_OpenTmpList_GXPG.html" />
    <Content Include="views\Baseset\基础资料\Gy_BadCountDevelopWHList.html" />
    <Content Include="views\Baseset\基础资料\Gy_BadWHList.html" />
    <Content Include="views\Baseset\基础资料\Gy_ClassTimePrjGroupEdit.html" />
@@ -106,6 +118,7 @@
    <Content Include="views\Baseset\基础资料\Gy_EquipFileBillMainList.html" />
    <Content Include="views\Baseset\基础资料\Gy_GetProcNoList.html" />
    <Content Include="views\Baseset\基础资料\Gy_LineCenter.html" />
    <Content Include="views\Baseset\基础资料\Gy_MaterialList_LSQP.html" />
    <Content Include="views\Baseset\基础资料\Gy_MaterList.html" />
    <Content Include="views\Baseset\基础资料\Gy_MouldFileMainList.html" />
    <Content Include="views\Baseset\基础资料\Gy_MouldList.html" />
@@ -146,6 +159,10 @@
    <Content Include="views\grf\a.grf" />
    <Content Include="views\grf\b1.grf" />
    <Content Include="views\grf\b.grf" />
    <Content Include="views\home\console_QiaoYi.html" />
    <Content Include="views\home\console_Mobile_QiaoYi.html" />
    <Content Include="views\index_Mobile_QiaoYi.html" />
    <Content Include="views\index_QiaoYi.html" />
    <Content Include="views\index - 复制.html" />
    <Content Include="views\indexMenu.html" />
    <Content Include="views\IpadStepIndex.html" />
@@ -161,16 +178,43 @@
    <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\pda.jpg" />
    <Content Include="views\userfiles\images\loginBackground-New.jpg" />
    <Content Include="views\userfiles\images\wy.jpg" />
    <Content Include="views\user\login_anrui.html" />
    <Content Include="views\user\login2.html" />
    <Content Include="views\video\1.wav" />
    <Content Include="views\video\jingbao.wav" />
    <Content Include="views\video\success.wav" />
    <Content Include="views\WMS扫码模块\生产管理\生产组托单\Sc_PackUnionBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\生产管理\生产组托单\Sc_PackUnionBill_PDA.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_MaterType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_MaterTypeEdit.html" />
    <Content Include="views\基础资料\公用基础资料\HBarPlanPrint_GXPG.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Gy_WarehouseList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Gy_EmployeeList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Gy_SourceList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcExchSendWorkBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcExchRecordBackBillList.aspx" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillListQuery.html" />
    <Content Include="views\车间管理\工序出站汇报单\Cj_StationOutBill_QiaoYi.html" />
    <Content Include="views\车间管理\工序流转\MES_StationInBill_PDA_QiaoYi.html" />
    <Content Include="views\车间管理\工序流转\MES_StationOutBill_PDA_QiaoYi.html" />
    <Content Include="views\车间管理\工序流转\MES_StationOutBill_PDA_Detail.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcExchRecordBackBillList.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcExchRecordBackBillEdit.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessSendWorkEdit.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessSendWorkList.html" />
    <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" />
    <Content Include="views\仓存管理\仓库调拨\Kf_MoveStockOutBill_Fast.html" />
    <Content Include="views\仓存管理\仓库调拨\Kf_MoveStockRequestBillEdit.html" />
    <Content Include="views\仓存管理\仓库调拨\Kf_MoveStockRequestBillList.html" />
@@ -183,6 +227,8 @@
    <Content Include="views\仓存管理\条码库存\KF_ICInventoryByMaterID.html" />
    <Content Include="views\仓存管理\条码库存\KF_ICInventoryList_WMS.html" />
    <Content Include="views\仓存管理\条码生成\Gy_BarCodeBill.html" />
    <Content Include="views\基础资料\产品基础资料\Gy_StdMinPickQty.html" />
    <Content Include="views\基础资料\产品基础资料\Gy_StdMinPickQtyList.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_ConkType.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_OrderBackInfo.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_OrderLev.html" />
@@ -193,10 +239,16 @@
    <Content Include="views\基础资料\公用基础资料\Gy_ConkType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_PackType.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_PackType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_StockPlace_Edit.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_StockPlace_List.html" />
    <Content Include="views\基础资料\基础资料\Gy_CustLocationEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_CustLocationList.html" />
    <Content Include="views\基础资料\基础资料\Gy_EquipStatus.html" />
    <Content Include="views\基础资料\基础资料\Gy_EquipStatusEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_MatePriceSup.html" />
    <Content Include="views\基础资料\基础资料\Gy_MatePriceSupEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_MouldStatus.html" />
    <Content Include="views\基础资料\基础资料\Gy_MouldStatusEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_Operator.html" />
    <Content Include="views\基础资料\基础资料\Gy_OperatorEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_PaymentConditionEdit.html" />
@@ -209,6 +261,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" />
@@ -281,6 +335,11 @@
    <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" />
    <Content Include="views\grf\设备标签.grf" />
    <Content Include="views\grf\流转卡派工单.grf" />
    <Content Include="views\grf\eee.grf" />
    <Content Include="views\grf\工序派工单.grf" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>
@@ -844,6 +903,8 @@
    <Content Include="views\模治具管理\模具其他出库单\Sc_MouldOtherOutBill_PDA.html" />
    <Content Include="views\模治具管理\模具其他入库单\Sc_MouldOtherInBill_PDA.html" />
    <Content Include="views\模治具管理\模具采购入库单\Sc_MouldProdInBill_PDA.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_Add_MouldLifeUseBillList.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldLifeUseBillList.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldMoveStockStepOutBill.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldMoveStockStepInBill.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldMoveStockStepInBillList.html" />
@@ -873,6 +934,10 @@
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldProdOutBillList.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldScrapInBillList.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldScrapOutBillList.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldScrapRequestBill.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldScrapRequestBillList.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldStatusChangeBill.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldStatusChangeBillList.html" />
    <Content Include="views\模治具管理\模治具点检保养\Sc_MouldDotCheckBill_PDA.html" />
    <Content Include="views\模治具管理\模治具点检保养\Sc_MouldMaintainBill_PDA.html" />
    <Content Include="views\模治具管理\模治具管理\BatchGen_MouldFile.html" />
@@ -885,6 +950,13 @@
    <Content Include="views\模治具管理\模治具管理\KF_BarCodeStatusChangeBill.html" />
    <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" />
    <Content Include="views\设备管理\设备入库检验验收单\Sb_EquipStockInCheckBillList.html" />
    <Content Include="views\模治具管理\模治具管理\Sc_Add_MouldConkBookBillList.html" />
    <Content Include="views\模治具管理\模治具管理\Sc_Add_MouldDotCheckBillList.html" />
    <Content Include="views\模治具管理\模治具管理\Sc_Add_MouldDotCheckPlanBillList.html" />
@@ -1058,13 +1130,21 @@
    <Content Include="views\设备管理\Sb_EquipMaintainPlanBillEdit.html" />
    <Content Include="views\设备管理\Sb_EquipMaintainPlanBillList.html" />
    <Content Include="views\设备管理\Sc_Add_MouldDotCheckBillList.html" />
    <Content Include="views\设备管理\设备入库\Sb_EquipStockInCheckBill.html" />
    <Content Include="views\设备管理\设备入库\Sb_EquipStockInCheckBillList.html" />
    <Content Include="views\设备管理\设备备品备件\Sb_EquipSparepartsBill.html" />
    <Content Include="views\设备管理\设备备品备件\Sb_EquipSparepartsBillList.html" />
    <Content Include="views\设备管理\设备备品备件\Sb_EquipSparepartsChangeBill.html" />
    <Content Include="views\设备管理\设备备品备件\Sb_EquipSparepartsChangeBillList.html" />
    <Content Include="views\设备管理\设备投产检验验收单\Sb_EquipWorkBeforeCheckBillEdit.html" />
    <Content Include="views\设备管理\设备投产检验验收单\Sb_EquipWorkBeforeCheckBillList.html" />
    <Content Include="views\设备管理\设备投产\Sb_EquipWorkBeforeCheckBill.html" />
    <Content Include="views\设备管理\设备投产\Sb_EquipWorkBeforeCheckBillList.html" />
    <Content Include="views\设备管理\设备档案\Gy_EquipFileBillResume.html" />
    <Content Include="views\设备管理\设备档案\Gy_EquipFileMainEdit.html" />
    <Content Include="views\设备管理\设备档案\Gy_EquipFileMainList.html" />
    <Content Include="views\设备管理\设备状态\Sb_EquipStatusChangeBill.html" />
    <Content Include="views\设备管理\设备状态\Sb_EquipStatusChangeBillList.html" />
    <Content Include="views\设备管理\设备维修派工单\Sb_EquipRepairSendWorkBillEdit.html" />
    <Content Include="views\设备管理\设备维修派工单\Sb_EquipRepairSendWorkBillList.html" />
    <Content Include="views\设备管理\设备规程单\Sb_EquipDotCheckRuleEdit.html" />
@@ -1107,12 +1187,18 @@
    <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_StationInBill_QiaoYi.html" />
    <Content Include="views\车间管理\工序进站接收单\Cj_StationQty.html" />
    <Content Include="views\车间管理\工序进站接收单\MES_StationInBill_PDA.html" />
    <Content Include="views\车间管理\工序进站接收单\Sc_StationInBill_Mul_PDA.html" />
@@ -1208,10 +1294,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" />
@@ -1293,6 +1379,13 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_EquipTypeBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_EquipTypeBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_WarehouseList.aspx.cs">
      <DependentUpon>xmlLBM_Gy_WarehouseList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_WarehouseList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Gy_WarehouseList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_HEquipResumeBillList.aspx.cs">
      <DependentUpon>xmlLBM_Gy_HEquipResumeBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -1313,6 +1406,20 @@
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_Department_Edit.aspx.designer.cs">
      <DependentUpon>xmlLBM_Gy_Department_Edit.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_EmployeeList.aspx.cs">
      <DependentUpon>xmlLBM_Gy_EmployeeList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_EmployeeList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Gy_EmployeeList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_SourceList.aspx.cs">
      <DependentUpon>xmlLBM_Gy_SourceList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_SourceList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Gy_SourceList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill.aspx.cs">
      <DependentUpon>xmlLBM_HGy_BarCodeBill.aspx</DependentUpon>
@@ -1524,6 +1631,13 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ICMOBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Sc_ICMOBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcExchSendWorkBillList.aspx.cs">
      <DependentUpon>xmlLBM_Sc_ProcExchSendWorkBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcExchSendWorkBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Sc_ProcExchSendWorkBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList.aspx.cs">
      <DependentUpon>xmlLBM_Sc_ProcessExchangeBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -1538,6 +1652,13 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcExchRecordBackBillList.aspx.cs">
      <DependentUpon>xmlLBM_Sc_ProcExchRecordBackBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcExchRecordBackBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Sc_ProcExchRecordBackBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\生产工序管理\工序汇报单\xmlLBM_ProcessReport.aspx.cs">
      <DependentUpon>xmlLBM_ProcessReport.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>