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

zgq

2021-03-24 67f63831f75368fa83f3687f8b3d45ea0eb55394

 WebTM/WebTM.csproj

@@ -19,6 +19,8 @@
    <IISExpressAnonymousAuthentication />
    <IISExpressWindowsAuthentication />
    <IISExpressUseClassicPipelineMode />
    <Use64BitIISExpress />
    <UseGlobalApplicationHostFile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
@@ -254,6 +256,7 @@
    <None Include="layuiadmin\Scripts\jquery-1.4.1-vsdoc.js" />
    <Content Include="layuiadmin\Scripts\jquery-1.4.1.js" />
    <Content Include="layuiadmin\Scripts\jquery-1.4.1.min.js" />
    <Content Include="layuiadmin\Scripts\jquery-3.5.1.min.js" />
    <Content Include="layuiadmin\Scripts\json2.js" />
    <Content Include="layuiadmin\Scripts\webConfig.js" />
    <Content Include="layuiadmin\style\admin.css" />
@@ -274,6 +277,7 @@
    <Content Include="layuiadmin\tpl\system\theme.html" />
    <Content Include="layuiadmin\tpl\system\说明.txt" />
    <Content Include="layuiadmin\tpl\说明.txt" />
    <Content Include="layuiadmin\zgqCustom\zgqCustom.js" />
    <Content Include="views\app\content\comment.html" />
    <Content Include="views\app\content\contform.html" />
    <Content Include="views\app\content\list.html" />
@@ -296,6 +300,8 @@
    <Content Include="views\Baseset\基础资料\Gy_CustomerList.html" />
    <Content Include="views\Baseset\基础资料\Gy_DepartmentList.html" />
    <Content Include="views\Baseset\基础资料\Gy_EmployeeList.html" />
    <Content Include="views\Baseset\基础资料\Gy_GetProductionResourcesList.html" />
    <Content Include="views\Baseset\基础资料\Gy_WorkCenterList.html" />
    <Content Include="views\Baseset\基础资料\Gy_GetProductionTeamList.html" />
    <Content Include="views\Baseset\基础资料\Gy_StockPlaceList.html" />
    <Content Include="views\Baseset\基础资料\Gy_SupplierList.html" />
@@ -408,12 +414,37 @@
    <Content Include="views\user\user\userform.html" />
    <Content Include="views\user\说明.txt" />
    <Content Include="views\不良汇报\Xs_SeOrderPickUp.html" />
    <Content Include="views\仓库调拨\仓库调拨\Kf_MoveStockBill_Fast.html" />
    <Content Include="views\仓库调拨\仓库调拨\Kf_MoveStockBill_FastList.html" />
    <Content Include="views\仓存管理\仓库调拨\Cc_LookingForReturnBillList.html" />
    <Content Include="views\仓存管理\仓库调拨\Cc_LookingForReturnBill.html" />
    <Content Include="views\仓存管理\仓库调拨\Cc_LookingForBill.html" />
    <Content Include="views\仓存管理\仓库调拨\Kf_LookingForBillList.html" />
    <Content Include="views\仓存管理\仓库调拨\Kf_UpMoveStockBill.html" />
    <Content Include="views\仓存管理\仓库调拨\Kf_MoveStockBill_Fast.html" />
    <Content Include="views\仓存管理\仓库调拨\Kf_MoveStockBill_FastList.html" />
    <Content Include="views\公共页面\Kf_BarCodeEditDlg.html" />
    <Content Include="views\工序汇报\MES_StationInBill.html" />
    <Content Include="views\工序汇报\MES_StationOutBill.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_Material.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_Warehouse.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_Employee.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_Department.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_Group.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_BadReason.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_Process.html" />
    <Content Include="views\基础资料\生产基础资料\H_ProcessDetail.html" />
    <Content Include="views\基础资料\生产基础资料\H_ProcessList.html" />
    <Content Include="views\生产管理\生产任务单\Sc_ICMOBillList.html" />
    <Content Include="views\组装单\Sc_AssemblyBill_Fast.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillList.html" />
    <Content Include="views\车间管理\工序流转\MES_StationInBill.html" />
    <Content Include="views\车间管理\工序流转\MES_StationInBillList.html" />
    <Content Include="views\车间管理\工序流转\MES_StationInBill_PDA.html" />
    <Content Include="views\车间管理\工序流转\MES_StationOutBill.html" />
    <Content Include="views\车间管理\工序流转\MES_StationOutBillList.html" />
    <Content Include="views\车间管理\工序流转\MES_StationOutBill_PDA.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBill.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeBillList.html" />
    <Content Include="views\车间管理\报表分析\Qk_OutProcessList.html" />
    <Content Include="views\车间管理\报表分析\Sc_ProductionProcessDetailsReport.html" />
    <Content Include="views\车间管理\报表分析\Sc_WorkShopReport.html" />
    <Content Include="views\领料发货\其他出库\Kf_OtherOutBackBill_FastList.html" />
    <Content Include="views\领料发货\其他出库\Kf_OtherOutBill_FastList.html" />
    <Content Include="views\领料发货\其他出库\Kf_OtherOutBackBill_Fast.html" />
@@ -456,8 +487,8 @@
    <Compile Include="Properties\AssemblyInfo.cs" />
  </ItemGroup>
  <ItemGroup>
    <Folder Include="views\仓库调拨\调拨单核对\" />
    <Folder Include="views\仓库调拨\调拨单稽核\" />
    <Folder Include="views\仓存管理\调拨单核对\" />
    <Folder Include="views\仓存管理\调拨单稽核\" />
  </ItemGroup>
  <PropertyGroup>
    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>