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

yangle

2024-03-15 791453617b93d367db37862068c5f7a674a1d69e

 WebTM/WebTM.csproj

@@ -230,6 +230,8 @@
    <Content Include="views\WMS扫码模块\其他出库\Kf_OtherOutBill_PDA.html" />
    <Content Include="views\WMS扫码模块\其他出库\Kf_OtherOutBackBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\其他出库\Kf_OtherOutBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\出门确认单\Xs_OutDoorCheckBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\出门确认单\Xs_OutDoorCheckBill_PDA.html" />
    <Content Include="views\WMS扫码模块\委外入库\Kf_EntrustInBackBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\委外入库\Kf_EntrustInBillList_PDA.html" />
    <Content Include="views\WMS扫码模块\委外入库\Kf_EntrustInBill_PDA.html" />
@@ -267,6 +269,8 @@
    <Content Include="views\WMS扫码模块\销售出库\Kf_SellOutBill_QiaoYi_PDA.html" />
    <Content Include="views\人事管理\异常反馈单\OA_ErrMsgBackBillList_PDA.html" />
    <Content Include="views\人事管理\异常反馈单\OA_ErrMsgBackBill_PDA.html" />
    <Content Include="views\仓存管理\仓库调拨\Add_Edit_Kf_MoveStockBill.html" />
    <Content Include="views\仓存管理\分步式调入单\Fb_StepFoldinBillEdit.html" />
    <Content Include="views\仓存管理\条码库存\KF_PonderationBillMain_Temp.html" />
    <Content Include="views\仓存管理\条码报表\Kf_MaterOutInReport.html" />
    <Content Include="views\仓存管理\条码报表\Kf_ICInventory_Mater.html" />
@@ -324,8 +328,14 @@
    <Content Include="views\基础资料\公用基础资料\Gy_MaterTypeEdit.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_TemporaryArea.html" />
    <Content Include="views\基础资料\公用基础资料\HBarPlanPrint_GXPG.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HGy_CardChangeType.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HGy_CardStatus.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HGy_CardAddress.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HGy_CardType.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HGy_FixCard.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Pay_WorkTimesBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_MyTicke.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLYS_ReceiveOtherBillMainList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlPM_WorkTaskBillMyList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlPM_ProjectBillMainMy.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Kf_SellOutBillList.aspx" />
@@ -368,6 +378,14 @@
    <Content Include="views\基础资料\生产基础资料\Gy_DisposeWayList.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_ScrapReasonList.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_Souce_Excel.html" />
    <Content Include="views\基础资料\设备基础资料\Gy_CardAddress.html" />
    <Content Include="views\基础资料\设备基础资料\Gy_CardChangeType.html" />
    <Content Include="views\基础资料\设备基础资料\Gy_CardStatus.html" />
    <Content Include="views\基础资料\设备基础资料\Gy_CardChangeTypeList.html" />
    <Content Include="views\基础资料\设备基础资料\Gy_CardType.html" />
    <Content Include="views\基础资料\设备基础资料\Gy_CardAddressList.html" />
    <Content Include="views\基础资料\设备基础资料\Gy_CardStatusList.html" />
    <Content Include="views\基础资料\设备基础资料\Gy_CardTypeList.html" />
    <Content Include="views\基础资料\隐藏列设置\Gy_QueryCondition.html" />
    <Content Include="views\工资管理\加班申请\Pay_OverApplyBill.html" />
    <Content Include="views\工资管理\加班申请\Pay_OverApplyBillList.html" />
@@ -472,6 +490,8 @@
    <Content Include="views\设备管理\Sb_EquipMaintainBill_PDA.html" />
    <Content Include="views\设备管理\Sb_EquipRepairCheckBillList_PDA.html" />
    <Content Include="views\设备管理\Sb_EquipRepairCheckBill_PDA.html" />
    <Content Include="views\设备管理\固定资产卡片\Gy_FixCardBill.html" />
    <Content Include="views\设备管理\固定资产卡片\Gy_FixCardBillList.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipConkBookBillReport.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipRepairWorkBillReport.html" />
    <Content Include="views\设备管理\设备报表\Sb_EquipDotCheckBillReport.html" />
@@ -717,6 +737,7 @@
    <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>
@@ -1596,10 +1617,11 @@
    <Content Include="views\采购管理\采购退料单\Cg_PurchaseReturn_Add_Up.html" />
    <Content Include="views\销售管理\信用额度申请单\Xs_CusRatingChangeBill.html" />
    <Content Include="views\销售管理\信用额度申请单\Xs_CusRatingChangeBillList.html" />
    <Content Include="views\销售管理\其他应付单\YF_PayMentOtherBillMain.html" />
    <Content Include="views\销售管理\其他应付单\YF_PayMentOtherBillMainList.html" />
    <Content Include="views\销售管理\其他应收单\YS_ReceiveOtherBillMain.htmlList.html" />
    <Content Include="views\采购管理\其他应付单\YF_PayMentOtherBillMain.html" />
    <Content Include="views\采购管理\其他应付单\YF_PayMentOtherBillMainList.html" />
    <Content Include="views\销售管理\其他应收单\YS_ReceiveOtherBillMainList.html" />
    <Content Include="views\销售管理\其他应收单\YS_ReceiveOtherBillMain.html" />
    <Content Include="views\销售管理\出门确认单\Xs_OutDoorCheckBillList.html" />
    <Content Include="views\销售管理\发货通知单\Add_Edit_Xs_SeOutStockBillList.html" />
    <Content Include="views\采购管理\应付退款单\YF_PayMentBackBill.html" />
    <Content Include="views\采购管理\应付退款单\YF_PayMentBackBillList.html" />
@@ -1618,6 +1640,8 @@
    <Content Include="views\销售管理\销售订单\Xs_SeOrderBillDyColList.html" />
    <Content Include="views\销售管理\销售订单变更单\Xs_SeOrderChangeBill.html" />
    <Content Include="views\销售管理\销售订单变更单\Xs_SeOrderChangeBillList.html" />
    <Content Include="views\销售管理\销售调价单\Xs_SellOutChangeBill.html" />
    <Content Include="views\销售管理\销售调价单\Xs_SellOutChangeBillList.html" />
    <Content Include="views\销售管理\销售退货单\Add_Edit_Kf_ICStockBillMainList.html" />
    <Content Include="views\销售管理\销售退货单\Kf_ICStockBackBill.html" />
    <Content Include="views\销售管理\销售退货单\Kf_ICStockBackBillList.html" />
@@ -1656,6 +1680,7 @@
    <Content Include="views\项目管理\项目阶段\PM_ProjectReportBill.html" />
    <Content Include="views\项目管理\项目阶段\PM_ProjectStageBillList.html" />
    <Content Include="views\项目管理\项目阶段\PM_ProjectStageBill.html" />
    <Content Include="views\领料发货\其他出库\Add_Edit_Kf_OtherOutBill.html" />
    <Content Include="views\领料发货\其他出库\Kf_OtherOutBill_Check.html" />
    <Content Include="views\领料发货\分步式调出单\Fb_StepFoldOutBillEdit.html" />
    <Content Include="views\领料发货\分步式调出单\Fb_StepFoldOutBillList.html" />
@@ -1686,6 +1711,7 @@
    <Content Include="views\领料发货\领料出库\Kf_StockOutRequestBillList.html" />
    <Content Include="views\验收入库\产品入库\Kf_ICStockBillSub_WMS_List.html" />
    <Content Include="views\验收入库\产品入库\Kf_ProductInBillList.html" />
    <Content Include="views\验收入库\其他入库\Add_Edit_Kf_OtherInBill.html" />
    <Content Include="views\验收入库\其他入库\Kf_OtherInBillList.html" />
    <Content Include="views\模治具管理\模治具管理\Kf_ProductInBillList.html" />
    <Content Include="views\验收入库\其他入库\Kf_OtherOutBill_Check_New.html" />
@@ -1820,6 +1846,41 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_EquipTypeBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_EquipTypeBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_CardChangeType.aspx.cs">
      <DependentUpon>xmlLBM_HGy_CardChangeType.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_CardChangeType.aspx.designer.cs">
      <DependentUpon>xmlLBM_HGy_CardChangeType.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_CardStatus.aspx.cs">
      <DependentUpon>xmlLBM_HGy_CardStatus.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_CardStatus.aspx.designer.cs">
      <DependentUpon>xmlLBM_HGy_CardStatus.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_CardAddress.aspx.cs">
      <DependentUpon>xmlLBM_HGy_CardAddress.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_CardAddress.aspx.designer.cs">
      <DependentUpon>xmlLBM_HGy_CardAddress.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_CardType.aspx.cs">
      <DependentUpon>xmlLBM_HGy_CardType.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_CardType.aspx.designer.cs">
      <DependentUpon>xmlLBM_HGy_CardType.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_FixCard.aspx.cs">
      <DependentUpon>xmlLBM_HGy_FixCard.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_HGy_FixCard.aspx.designer.cs">
      <DependentUpon>xmlLBM_HGy_FixCard.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Pay_WorkTimesBillList.aspx.cs">
      <DependentUpon>xmlLBM_Pay_WorkTimesBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -1834,6 +1895,13 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_MyTicke.aspx.designer.cs">
      <DependentUpon>xmlLBM_Sc_MyTicke.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLYS_ReceiveOtherBillMainList.aspx.cs">
      <DependentUpon>xmlLYS_ReceiveOtherBillMainList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLYS_ReceiveOtherBillMainList.aspx.designer.cs">
      <DependentUpon>xmlLYS_ReceiveOtherBillMainList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlPM_WorkTaskBillMyList.aspx.cs">
      <DependentUpon>xmlPM_WorkTaskBillMyList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>