合并

ch

2022-01-16 cf866c4946a15efa23b942f90f9f95da7a5d30c2

 WebTM/WebTM.csproj

@@ -87,6 +87,7 @@
    <Content Include="layuiadmin\PubJs\PubCheck.js" />
    <Content Include="views\Baseset\HBarPlanPrint.html" />
    <Content Include="views\Baseset\基础资料\Gy_QCCheckProjectListView.html" />
    <Content Include="views\Baseset\基础资料\Gy_RoutingGroup.html" />
    <Content Include="views\Baseset\基础资料\Sc_ICMOBillListView2.html" />
    <Content Include="views\Baseset\基础资料\Sc_ProcessExchangeBillListView.html" />
    <Content Include="views\Baseset\基础资料\Gy_QCCheckItemListView.html" />
@@ -124,14 +125,19 @@
    <Content Include="views\PublicPage\transfer.html" />
    <Content Include="views\ReportHtml.html" />
    <Content Include="views\test\testRenderAutomationList.html" />
    <Content Include="views\video\jingbao.wav" />
    <Content Include="views\仓存管理\仓库调拨\Kf_MoveStockRequestBillList.html" />
    <Content Include="views\仓存管理\仓库调拨\Kf_MoveStockStepOutBill_Fast.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_ClassTimePrjSub.html" />
    <Content Include="views\仓存管理\分步式调入单\Fb_StepFoldinBillList.html" />
    <Content Include="views\仓存管理\委外用料单\WW_PPBomBillList.html" />
    <Content Include="views\仓存管理\扫码异常记录表\KF_PonderationBillList.html" />
    <Content Include="views\仓存管理\条码出入库记录表\Kf_ICStockBillSubList.html" />
    <Content Include="views\仓存管理\条码库存\KF_ICInventoryList_WMS.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_OrderBackInfo.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_OrderBackInfo.html.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_OrderLev.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_WorkPayType.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_WorkType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_ClassTimePrjSub.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Pay_PeriodInfoSet.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkPayType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkType.html" />
@@ -144,8 +150,6 @@
    <Content Include="views\基础资料\公用基础资料\Gy_Employee_Add_Edit_.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_EquipType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_EquipTypeEdit.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_ClassTimePrj.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_ClassTimePrj.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkCenter_Add_Edit.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_MouldType.html" />
    <Content Include="views\基础资料\公用基础资料\grf\b.grf" />
@@ -169,6 +173,9 @@
    <Content Include="views\基础资料\公用基础资料\grf\器具改制入库单.grf" />
    <Content Include="views\基础资料\公用基础资料\grf\器具改制出库单.grf" />
    <Content Include="views\基础资料\公用基础资料\grf\器具采购入库单.grf" />
    <Content Include="views\grf\设备档案.grf" />
    <Content Include="views\grf\器具档案.grf" />
    <Content Include="views\grf\销售退货单.grf" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>
@@ -574,13 +581,16 @@
    <Content Include="views\基础资料\公用基础资料\Gy_EquipMent.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkCenter.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_Currency.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_EquipFileMainBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_EquipMaintainBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_EquipMaintainPlanBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_EquipTypeBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Gy_Material.aspx" />
    <Content Include="views\基础资料\公用基础资料\Gy_DepartmentList.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_ICStockBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldDotCheckBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldDotCheckPlanBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldFileMainBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldMaintainBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldMaintainPlanBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldProdInStockBill.aspx" />
@@ -609,6 +619,7 @@
    <Content Include="views\基础资料\基础资料\Gy_StockCheckItemEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_StockCheckItemList.html" />
    <Content Include="views\基础资料\基础资料\InventoryAnalysis.html" />
    <Content Include="views\基础资料\基础资料\Sc_MouldStockBillMain_Temp.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_ProcPriceList.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_Group_Add_Edit.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_ProcPrice.html" />
@@ -658,8 +669,10 @@
    <Content Include="views\工资管理\工资结算单%28其他%29\Pay_OtherBalBillList.html" />
    <Content Include="views\工资管理\工资结算单%28集体%29\Pay_GroupBalBillEdit.html" />
    <Content Include="views\工资管理\工资结算单%28集体%29\Pay_GroupBalBillList.html" />
    <Content Include="views\工资管理\核算方式\Gy_ClassTimePrjSubBillEdit.html" />
    <Content Include="views\工资管理\核算方式\Gy_ClassTimePrjBillEdit.html" />
    <Content Include="views\工资管理\核算方式\Gy_ClassTimePrjBillList.html" />
    <Content Include="views\工资管理\核算方式\Gy_ClassTimePrjSubBillList.html" />
    <Content Include="views\工资管理\班组职员清单\Gy_GroupEmpBillEdit.html" />
    <Content Include="views\工资管理\班组职员清单\Gy_GroupEmpBillList.html" />
    <Content Include="views\工资管理\考勤汇报单\Pay_WorkTimesBillEdit.html" />
@@ -667,6 +680,8 @@
    <Content Include="views\模治具管理\器具报表\ReportInventoryAccount.html" />
    <Content Include="views\模治具管理\器具报表\ReportMaterialReceipt.html" />
    <Content Include="views\模治具管理\器具报表\ReportMouldStock.html" />
    <Content Include="views\模治具管理\器具维修派工单\Sc_MouldRepairSendWorkBillEdit.html" />
    <Content Include="views\模治具管理\器具维修派工单\Sc_MouldRepairSendWorkBillList.html" />
    <Content Include="views\模治具管理\模具处理出库单\Sc_MouldScrapOutBill_PDA.html" />
    <Content Include="views\模治具管理\模具寿命调整单\Sc_MouldLifeChangeBill_PDA.html" />
    <Content Include="views\模治具管理\模具改制入库单\Sc_MouldRepairInBill_PDA.html" />
@@ -767,6 +782,8 @@
    <Content Include="views\生产管理\生产停工单\Sc_Add_MESStopWorkBillList - 复制.html" />
    <Content Include="views\生产管理\生产停工单\Sc_Add_MESStopWorkBillList.html" />
    <Content Include="views\生产管理\生产停工单\Sc_MESStopWorkBillList.html" />
    <Content Include="views\生产管理\生产包装单\Sc_PackUnionBill.html" />
    <Content Include="views\生产管理\生产包装单\Sc_PackUnionBillEdit.html" />
    <Content Include="views\生产管理\生产完工单\Sc_Add_MESEndWorkBillList - 复制.html" />
    <Content Include="views\生产管理\生产完工单\Sc_Add_MESEndWorkBillList.html" />
    <Content Include="views\生产管理\生产完工单\Sc_MESEndWorkBillList.html" />
@@ -776,6 +793,7 @@
    <Content Include="views\生产管理\生产汇报单\Sc_ICMOReportBill_FastNew.html" />
    <Content Include="views\生产管理\生产汇报单\Sc_Add_ICMOReportBillList.html" />
    <Content Include="views\生产管理\生产组装追溯单\Sc_AssemblyBillList.html" />
    <Content Include="views\生产管理\生产退库单\Sc_ProductionReturnList.html" />
    <Content Include="views\生产管理\组装单\Sc_GroupOrderBillList.html" />
    <Content Include="views\生产管理\质量汇报单\Sc_QualityReportBill.html" />
    <Content Include="views\生产管理\质量汇报单\Sc_QualityReportBillList.html" />
@@ -795,6 +813,7 @@
    <Content Include="views\系统管理\系统参数管理\Xt_SystemParameter_Edit.html" />
    <Content Include="views\系统管理\系统参数管理\Xt_SystemParameterList.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBill.html" />
    <Content Include="views\计划管理\工艺路线大类\Gy_RoutingGroupList.html" />
    <Content Include="views\设备管理\Sb_Add_EqpConkBookBillList.html" />
    <Content Include="views\设备管理\Sb_Add_EqpMaintenanceBillList.html" />
    <Content Include="views\设备管理\Sb_Add_EqpRepairCheckBillList.html" />
@@ -802,6 +821,7 @@
    <Content Include="views\设备管理\Sb_EqpMaintenanceBillList.html" />
    <Content Include="views\设备管理\Sb_EqpMaintenanceBillList_PDA.html" />
    <Content Include="views\设备管理\Sb_EqpRepairCheckBillList.html" />
    <Content Include="views\设备管理\Sb_EquipDocCheckItemBillList_PDAEdit.html" />
    <Content Include="views\设备管理\Sb_EquipDotCheckBillEdit.html" />
    <Content Include="views\设备管理\Sb_EquipDotCheckBillList.html" />
    <Content Include="views\设备管理\Sb_EquipDotCheckBillList_PDA.html" />
@@ -809,14 +829,17 @@
    <Content Include="views\设备管理\Sb_EquipDotCheckPlanBillList.html" />
    <Content Include="views\设备管理\Sb_EquipMaintainBillEdit.html" />
    <Content Include="views\设备管理\Sb_EquipMaintainBillList.html" />
    <Content Include="views\设备管理\Sb_EquipMaintainBillList_Mul.html" />
    <Content Include="views\设备管理\Sb_EquipMaintainBillList_PDA.html" />
    <Content Include="views\设备管理\Sb_EquipMaintainPlanBillEdit.html" />
    <Content Include="views\设备管理\Sb_EquipMaintainPlanBillList.html" />
    <Content Include="views\设备管理\Sc_Add_MouldDotCheckBillList.html" />
    <Content Include="views\设备管理\设备档案\Gy_EquipFileMainEdit.html" />
    <Content Include="views\设备管理\设备档案\Gy_EquipFileMainList.html" />
    <Content Include="views\设备管理\设备维修派工单\Sb_EquipRepairSendWorkBillList.html" />
    <Content Include="views\设备管理\设备规程单\Sb_EquipDotCheckRuleEdit.html" />
    <Content Include="views\设备管理\设备规程单\Sb_EquipDotCheckRuleList.html" />
    <Content Include="views\设备管理\Sb_EquipMaintainBillList_MulEdit.html" />
    <Content Include="views\设备管理\设备规程单\Sb_EquipMaintainRuleEdit.html" />
    <Content Include="views\设备管理\设备规程单\Sb_EquipMaintainRuleList.html" />
    <Content Include="views\质量管理\出厂检验单\QC_OutCompCheckBill.html" />
@@ -852,11 +875,17 @@
    <Content Include="views\车间管理\工序进站接收单\MES_StationInBill_PDA.html" />
    <Content Include="views\车间管理\工序进站接收单\Sc_StationInBill_Mul_PDA.html" />
    <Content Include="views\车间管理\工序进站接收单\Sc_StationInBill_Mul.html" />
    <Content Include="views\车间管理\报表分析\Sc_StationInBillList.html" />
    <Content Include="views\采购管理\收料通知单\Add_Edit_Cg_POInStockBillList.html" />
    <Content Include="views\采购管理\退料通知单\Add_Edit_Cg_POInStockBackBillList.html" />
    <Content Include="views\采购管理\采购订单\Cg_POOrderBillList.html" />
    <Content Include="views\采购管理\采购退料单\Cg_PurchaseReturnList.html" />
    <Content Include="views\采购管理\采购退料单\Cg_PurchaseReturn_Add_Up.html" />
    <Content Include="views\销售管理\发货通知单\Add_Edit_Xs_SeOutStockBillList.html" />
    <Content Include="views\销售管理\销售退货单\Add_Edit_Kf_ICStockBillMainList.html" />
    <Content Include="views\销售管理\销售退货单\Kf_ICStockBillMainList.html" />
    <Content Include="views\销售管理\销售订单\Add_Edit_Xs_SeOrderBillList.html" />
    <Content Include="views\领料发货\分步式调出单\Fb_StepFoldOutBillList.html" />
    <Content Include="views\领料发货\委外出库\Kf_EntrustOutBillList.html" />
    <Content Include="views\领料发货\收料入库\Kf_ReciveBill_Fast.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutBillLEdit.html" />
@@ -960,6 +989,13 @@
    <Compile Include="App_Data\MssqlReportData.cs" />
    <Compile Include="App_Data\ReportData.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_EquipFileMainBill.aspx.cs">
      <DependentUpon>xmlLBM_EquipFileMainBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_EquipFileMainBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_EquipFileMainBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_EquipMaintainBill.aspx.cs">
      <DependentUpon>xmlLBM_EquipMaintainBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -995,6 +1031,13 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_Department_Edit.aspx.designer.cs">
      <DependentUpon>xmlLBM_Gy_Department_Edit.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_ICStockBill.aspx.cs">
      <DependentUpon>xmlLBM_ICStockBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_ICStockBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_ICStockBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldDotCheckBill.aspx.cs">
      <DependentUpon>xmlLBM_MouldDotCheckBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -1008,6 +1051,13 @@
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldDotCheckPlanBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_MouldDotCheckPlanBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldFileMainBill.aspx.cs">
      <DependentUpon>xmlLBM_MouldFileMainBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldFileMainBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_MouldFileMainBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldMaintainBill.aspx.cs">
      <DependentUpon>xmlLBM_MouldMaintainBill.aspx</DependentUpon>
@@ -1125,6 +1175,7 @@
  <ItemGroup>
    <Folder Include="views\仓存管理\调拨单核对\" />
    <Folder Include="views\仓存管理\调拨单稽核\" />
    <Folder Include="views\生产管理\生产拆箱单\" />
  </ItemGroup>
  <PropertyGroup>
    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>