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

chenhaozhe

8 天以前 e5731626180db73f9e98bfda4c06d9aacf554df5

 WebTM/WebTM.csproj

@@ -203,6 +203,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 +495,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" />
@@ -638,6 +640,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" />
@@ -754,6 +757,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" />
@@ -989,6 +993,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" />
@@ -2617,6 +2622,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" />
@@ -2625,6 +2631,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" />
@@ -2749,6 +2756,13 @@
    <Compile Include="App_Data\MssqlReportData.cs" />
    <Compile Include="App_Data\ReportData.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <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>