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

chenhaozhe

9 天以前 f50cd9cfde1cdfc8e5b2205a63bdb2694da28e1c

 WebTM/WebTM.csproj

@@ -119,7 +119,11 @@
    <Content Include="layuiadmin\layui\layui.js" />
    <Content Include="layuiadmin\layui\layui2.10.0.js" />
    <Content Include="layuiadmin\modules\dropdown-disable.js" />
    <Content Include="layuiadmin\modules\numinput.js" />
    <Content Include="layuiadmin\modules\timerManager.js" />
    <Content Include="layuiadmin\modules\treeTable.js" />
    <Content Include="layuiadmin\qrcode\qrcode.js" />
    <Content Include="layuiadmin\qrcode\qrcode.min.js" />
    <Content Include="layuiadmin\resize\ResizeLeftRight.css" />
    <Content Include="layuiadmin\resize\ResizeLeftRight.js" />
    <Content Include="layuiadmin\QueryScheme.js" />
@@ -194,6 +198,7 @@
    <Content Include="views\Baseset\基础资料\Gy_EnvironmentTestSchemeBillList.html" />
    <Content Include="views\WMS扫码模块\委外领料\Kf_EntrustOutBackBill_CheckList_PDA.html" />
    <Content Include="views\WMS扫码模块\委外领料\Kf_EntrustOutBackBill_Check_PDA.html" />
    <Content Include="views\WMS扫码模块\库存查询\KF_ICInventory_WorkShop_PDA.html" />
    <Content Include="views\WMS扫码模块\生产入库\Kf_ProductInBackBill_CheckList_PDA.html" />
    <Content Include="views\WMS扫码模块\生产入库\Kf_ProductInBackBill_Check_PDA.html" />
    <Content Include="views\WMS扫码模块\生产领料\Kf_MateOutBackBill_Check_PDA.html" />
@@ -203,6 +208,7 @@
    <Content Include="views\WMS扫码模块\采购入库\Kf_POStockInBackBill_Check_PDA.html" />
    <Content Include="views\WMS扫码模块\销售出库\Kf_SellOutBackBill_CheckList_PDA.html" />
    <Content Include="views\WMS扫码模块\销售出库\Kf_SellOutBackBill_Check_PDA.html" />
    <Content Include="views\仓存管理\条码生成\Gy_BarCodeBill_HuaZhou.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_Car.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_CostCenter.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_CostItem.html" />
@@ -494,6 +500,7 @@
    <Content Include="views\基础资料\公用基础资料\Gy_CostItemFixRate.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_CostItemAverageType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_CostItemAverageType.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Gy_WorkStationList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_XBarcode.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_ZB.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx" />
@@ -621,6 +628,8 @@
    <Content Include="views\基础资料\基础资料\Gy_CarTypeEdit.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_WorkType_Excel.html" />
    <Content Include="views\基础资料\成本基础资料\Add_Edit_Gy_CostAverageType.html" />
    <Content Include="views\基础资料\成本基础资料\Cb_OtherOutBill_CostSubjectDetail.html" />
    <Content Include="views\基础资料\成本基础资料\Cb_OtherOutBill_CostSubjectDetail_excelimport.html" />
    <Content Include="views\基础资料\成本基础资料\CB_Wip_excelImport.html" />
    <Content Include="views\基础资料\成本基础资料\Gy_CostAverageTypeList.html" />
    <Content Include="views\基础资料\生产基础资料\Add_Edit_Gy_ProcMul.html" />
@@ -638,6 +647,7 @@
    <Content Include="views\基础资料\通用基础资料\Gy_CommonBaseData.html" />
    <Content Include="views\基础资料\通用基础资料\Gy_CommonBaseDataCheck.html" />
    <Content Include="views\基础资料\通用基础资料\Gy_GeneralLookDown.html" />
    <Content Include="views\基础资料\采购基础资料\Gy_Supplier2_JD.html" />
    <Content Include="views\基础资料\采购基础资料\Gy_Supplier_Excel.html" />
    <Content Include="views\基础资料\销售基础资料\Gy_MateNumRelation.html" />
    <Content Include="views\基础资料\销售基础资料\Gy_MateNumRelationList.html" />
@@ -665,6 +675,11 @@
    <Content Include="views\应收管理\报表分析\YS_CusShouldIncomeMaterEntryReport.html" />
    <Content Include="views\成本管理\成本费用单\CB_ItemMoneyBillList.html" />
    <Content Include="views\成本管理\成本费用单\CB_ItemMoneyBillEdit.html" />
    <Content Include="views\成本管理\成本费用报表\CB_ActualItemMoneyCost.html" />
    <Content Include="views\成本管理\成本费用调整单\CB_ChangeMoneyBillEdit.html" />
    <Content Include="views\成本管理\成本费用调整单\CB_ChangeMoneyBillList.html" />
    <Content Include="views\成本管理\期初在产品表\Gy_WIPBal_Excel.html" />
    <Content Include="views\成本管理\期初在产品表\Kf_WIPBal.html" />
    <Content Include="views\成本管理\费用单引入\CB_CostProjectImport.html" />
    <Content Include="views\成本管理\费用单引入\CB_CostAccounting.html" />
    <Content Include="views\成本管理\费用单引入\CB_ItemMoneyBillImport.html" />
@@ -673,6 +688,8 @@
    <Content Include="views\案例代码\华远\HY_HistogramReport_ForPCSCheckNote.html" />
    <Content Include="views\案例代码\华远\HY_HistogramReport.html" />
    <Content Include="views\案例代码\华远\HY_InterfaceTest.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldDailyUseReport.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldMonthUseReport.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MoldMainoverdueWarnReport.html" />
    <Content Include="views\模治具管理\器具领用申请单\Sc_MouldOutRequestBillEdit.html" />
    <Content Include="views\模治具管理\器具领用申请单\Sc_MouldOutRequestBillList.html" />
@@ -749,6 +766,7 @@
    <Content Include="views\生产管理\三升排产\JIT_DayPlanPlatFormImport_SS.html" />
    <Content Include="views\生产管理\制造周期报表\Sc_ProductionCycleBillList.html" />
    <Content Include="views\生产管理\宝工排产\JIT_DayPlanPlatForm_New.html" />
    <Content Include="views\生产管理\投料防错单\Sc_FeedingErrorProofingBillList.html" />
    <Content Include="views\生产管理\报工台工序\停工恢复单\Sc_MESStopRestoreWorkBill.html" />
    <Content Include="views\生产管理\凯贝日计划导入\JIT_DayPlanPlatForm_KB.html" />
    <Content Include="views\生产管理\发货计划平台（三升）\Xs_SendGoodsPlanForm.html" />
@@ -876,6 +894,7 @@
    <Content Include="views\设备管理\设备工艺参数订单点检表\SB_EquipICMOTechParamBillEdit.html" />
    <Content Include="views\设备管理\设备开机单\Sb_EquipBeginBillList_PDA.html" />
    <Content Include="views\设备管理\设备开机单\Sb_EquipBeginBill_PDA.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipDailyRunStateReport.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipDotCheckTaskReport.html" />
    <Content Include="views\设备管理\设备报表\SB_EquipICMOTechParamReport.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipMentCollectionTechParam_Temp.html" />
@@ -984,6 +1003,7 @@
    <Content Include="views\车间管理\关键件绑定\Sc_KeyElementBindingList.html" />
    <Content Include="views\车间管理\关键件绑定\Sc_KeyElementBinding.html" />
    <Content Include="views\车间管理\单品过站\SingleItemTransitList.html" />
    <Content Include="views\车间管理\单品过站_小卫\Cj_BarCodePrint.html" />
    <Content Include="views\车间管理\单品过站_小卫\Cj_zuituoxiaowei_cacheList.html" />
    <Content Include="views\车间管理\单品过站_小卫\Cj_ProcessItemStationPlatform_ShippingExport.html" />
    <Content Include="views\车间管理\单品过站_小卫\Cj_SaveSNByICMO.html" />
@@ -1038,6 +1058,7 @@
    <Content Include="views\车间管理\报表分析\Mes_OrderProcFlowAllReport_ICMO.html" />
    <Content Include="views\车间管理\报表分析\Qc_PreventErrMouldCheckReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_AllowedPrintProcExchangeBillList.html" />
    <Content Include="views\车间管理\报表分析\Sc_ProcDailyRunStateReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_StationOutVarianceReport.html" />
    <Content Include="views\车间管理\报表分析\Kf_WorkShopICStockBillList.html" />
    <Content Include="views\车间管理\报表分析\Sc_WorkShopXJICInventoryList.html" />
@@ -2612,6 +2633,7 @@
    <Content Include="views\领料发货\生产补料\Kf_MateReplenishOutBill_CheckList_New.html" />
    <Content Include="views\领料发货\生产领料\Kf_ProductReceiveMaterialBillEdit.html" />
    <Content Include="views\领料发货\生产领料\Kf_ProductReceiveMaterialBillList.html" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBillList_template.html" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBillList_YP.html" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBillQuery.html" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBill.html" />
@@ -2620,6 +2642,7 @@
    <Content Include="views\领料发货\销售出库\Kf_SellOutBill_Check_New.html" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBillList_BarCodeNote.html" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBill_QiaoYi.html" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBill_template.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutBillEdit_MaoJian.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutBillEdit_YangMao.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutRequestBill.html" />
@@ -2744,6 +2767,17 @@
    <Compile Include="App_Data\MssqlReportData.cs" />
    <Compile Include="App_Data\ReportData.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Cj_StationOutBillList_HZ.aspx.cs">
      <DependentUpon>xmlLBM_Cj_StationOutBillList_HZ.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_WorkStationList.aspx.cs">
      <DependentUpon>xmlLBM_Gy_WorkStationList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_WorkStationList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Gy_WorkStationList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_BarCodeBill_MiddleBox.aspx.cs">
      <DependentUpon>xmlLBM_HGy_BarCodeBill_MiddleBox.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>