合并

yusijie

2023-04-16 22ae2a27d1f66c6acbb126fdbd3d1446b6837acb

 WebTM/WebTM.csproj

@@ -76,6 +76,8 @@
    <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" />
@@ -108,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" />
@@ -115,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" />
@@ -155,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" />
@@ -176,16 +184,28 @@
    <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\login_New.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" />
@@ -317,6 +337,9 @@
    <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>
@@ -1175,6 +1198,7 @@
    <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" />
@@ -1355,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>
@@ -1375,6 +1406,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_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>
@@ -1593,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>