Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

yusijie

2023-03-17 290ae5cf877a0989f268fa05e027ff2815a00cf8

 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,7 +65,15 @@
  </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\modules\layim\html\getmsg.json" />
@@ -103,9 +112,11 @@
    <Content Include="views\Baseset\基础资料\Gy_BadWHList.html" />
    <Content Include="views\Baseset\基础资料\Gy_ClassTimePrjGroupEdit.html" />
    <Content Include="views\Baseset\基础资料\Gy_ClassTimePrjList.html" />
    <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_MaterList.html" />
    <Content Include="views\Baseset\基础资料\Gy_MouldFileMainList.html" />
    <Content Include="views\Baseset\基础资料\Gy_MouldList.html" />
    <Content Include="views\Baseset\基础资料\Gy_OrganizationtList.html" />
    <Content Include="views\Baseset\基础资料\Gy_PoStockStyle.html" />
@@ -159,17 +170,33 @@
    <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\user\login_New.html" />
    <Content Include="views\video\1.wav" />
    <Content Include="views\video\jingbao.wav" />
    <Content Include="views\video\success.wav" />
    <Content Include="views\基础资料\公用基础资料\Gy_MaterType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_MaterTypeEdit.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Gy_SourceList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcExchRecordBackBillList.aspx" />
    <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" />
    <Content Include="views\仓存管理\仓库调拨\Kf_MoveStockStepOutBill_Fast.html" />
    <Content Include="views\仓存管理\分步式调入单\Fb_StepFoldinBillList.html" />
@@ -180,6 +207,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" />
@@ -190,9 +219,30 @@
    <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" />
    <Content Include="views\基础资料\基础资料\Gy_COMMONCONTACTEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_COMMONCONTACTList.html" />
    <Content Include="views\基础资料\基础资料\Gy_PropertyEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_RateTypeEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_RateTypeList.html" />
    <Content Include="views\基础资料\基础资料\Gy_SettleStyle.html" />
    <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" />
@@ -265,6 +315,8 @@
    <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" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>
@@ -724,6 +776,8 @@
    <Content Include="views\基础资料\基础资料\Gy_RecConditionEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_SupplierContactEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_SupplierContactList.html" />
    <Content Include="views\基础资料\基础资料\Gy_Work.html" />
    <Content Include="views\基础资料\基础资料\Gy_WorkEdit.html" />
    <Content Include="views\基础资料\基础资料\InventoryAnalysis.html" />
    <Content Include="views\基础资料\基础资料\Sc_MouldStockBillMain_Temp.html" />
    <Content Include="views\基础资料\工资基础资料\Add_Edit_Gy_WorkDay.html" />
@@ -812,6 +866,8 @@
    <Content Include="views\模治具管理\器具报表\ReportMaterialReceipt.html" />
    <Content Include="views\模治具管理\器具报表\ReportMouldStock.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldAvailableList.html" />
    <Content Include="views\模治具管理\器具点检规程单\Sc_MouldDotCheckRuleBillEdit.html" />
    <Content Include="views\模治具管理\器具点检规程单\Sc_MouldDotCheckRuleBillList.html" />
    <Content Include="views\模治具管理\器具维修派工单\Sc_MouldRepairSendWorkBillEdit.html" />
    <Content Include="views\模治具管理\器具维修派工单\Sc_MouldRepairSendWorkBillList.html" />
    <Content Include="views\模治具管理\模具处理出库单\Sc_MouldScrapOutBill_PDA.html" />
@@ -824,6 +880,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" />
@@ -853,14 +911,29 @@
    <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" />
    <Content Include="views\模治具管理\模治具管理\Gy_BarCodeBill_Out.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_BarCodeBill_OutList.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_CheckToolsFileMainList.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_MouldFileList.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_MouldFile.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_MouldFileResume.html" />
    <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" />
@@ -1034,9 +1107,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" />
@@ -1079,10 +1164,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" />
@@ -1110,7 +1200,12 @@
    <Content Include="views\领料发货\其他出库\Kf_OtherOutBill_Check.html" />
    <Content Include="views\领料发货\分步式调出单\Fb_StepFoldOutBillList.html" />
    <Content Include="views\领料发货\委外出库\Kf_EntrustOutBillList.html" />
    <Content Include="views\领料发货\委外出库\Kf_EntrustOutBill_Check_New.html" />
    <Content Include="views\领料发货\委外出库\Kf_EntrustOutBill_CheckList_New.html" />
    <Content Include="views\领料发货\委外补料\Kf_EntrustReplenishOutBill_Check_New.html" />
    <Content Include="views\领料发货\委外补料\Kf_EntrustReplenishOutBill_CheckList_New.html" />
    <Content Include="views\领料发货\收料入库\Kf_ReciveBill_Check.html" />
    <Content Include="views\领料发货\收料入库\Kf_ReciveBill_Fast_AR.html" />
    <Content Include="views\领料发货\收料入库\Kf_ReciveBill_Fast.html" />
    <Content Include="views\领料发货\生产补料\Kf_MateReplenishOutBill_Check_New.html" />
    <Content Include="views\领料发货\生产补料\Kf_MateReplenishOutBill_CheckList_New.html" />
@@ -1123,6 +1218,8 @@
    <Content Include="views\领料发货\领料出库\Kf_MateOutBill_FastCheck.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutBill_CheckList_New.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutBill_Check_New.html" />
    <Content Include="views\领料发货\领料出库\Kf_StockOutRequestBill.html" />
    <Content Include="views\领料发货\领料出库\Kf_StockOutRequestBillList.html" />
    <Content Include="views\验收入库\产品入库\Kf_ICStockBillSub_WMS_List.html" />
    <Content Include="views\验收入库\产品入库\Kf_ProductInBillList.html" />
    <Content Include="views\验收入库\其他入库\Kf_OtherInBillList.html" />
@@ -1173,10 +1270,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" />
@@ -1278,6 +1375,13 @@
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_Department_Edit.aspx.designer.cs">
      <DependentUpon>xmlLBM_Gy_Department_Edit.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>
@@ -1503,6 +1607,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>