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

yangle

2023-01-12 9c6ea8c61bf85ddccef11f9f1cf579d848d48ede

 WebTM/WebTM.csproj

@@ -103,21 +103,30 @@
    <Content Include="views\Baseset\基础资料\Gy_BadWHList.html" />
    <Content Include="views\Baseset\基础资料\Gy_ClassTimePrjGroupEdit.html" />
    <Content Include="views\Baseset\基础资料\Gy_ClassTimePrjList.html" />
    <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_MaterList.html" />
    <Content Include="views\Baseset\基础资料\Gy_MouldFileMainList.html" />
    <Content Include="views\Baseset\基础资料\Gy_MouldList.html" />
    <Content Include="views\Baseset\基础资料\Gy_OrganizationtList.html" />
    <Content Include="views\Baseset\基础资料\Gy_PoStockStyle.html" />
    <Content Include="views\Baseset\基础资料\Gy_QCCheckProjectListView.html" />
    <Content Include="views\Baseset\基础资料\Gy_RoutingBillList.html" />
    <Content Include="views\Baseset\基础资料\Gy_RoutingGroup.html" />
    <Content Include="views\Baseset\基础资料\Gy_SellStyle.html" />
    <Content Include="views\Baseset\基础资料\Gy_SettleStyle.html" />
    <Content Include="views\Baseset\基础资料\Gy_TechnologyParameterList.html" />
    <Content Include="views\Baseset\基础资料\Gy_TechParameterUnitList.html" />
    <Content Include="views\Baseset\基础资料\Gy_StockPlaceListNew.html" />
    <Content Include="views\Baseset\基础资料\Gy_UnitGroup.html" />
    <Content Include="views\Baseset\基础资料\Gy_WarehouseListNew.html" />
    <Content Include="views\Baseset\基础资料\Gy_WasterWHList.html" />
    <Content Include="views\Baseset\基础资料\Gy_WHList.html" />
    <Content Include="views\Baseset\基础资料\Gy_WWBadWHList.html" />
    <Content Include="views\Baseset\基础资料\Gy_WWWasterWHList.html" />
    <Content Include="views\Baseset\基础资料\Gy_WarehouseList_JIT.html" />
    <Content Include="views\Baseset\基础资料\OtherOutRequestBillList.html" />
    <Content Include="views\Baseset\基础资料\Sc_ICMOBillListView2.html" />
    <Content Include="views\Baseset\基础资料\Sc_ProcessExchangeBillListView.html" />
    <Content Include="views\Baseset\基础资料\Gy_QCCheckItemListView.html" />
@@ -163,6 +172,7 @@
    <Content Include="views\仓存管理\仓库调拨\Kf_MoveStockBill_CheckList_New.html" />
    <Content Include="views\仓存管理\仓库调拨\Kf_MoveStockBill_Check_New.html" />
    <Content Include="views\仓存管理\仓库调拨\Kf_MoveStockOutBill_Fast.html" />
    <Content Include="views\仓存管理\仓库调拨\Kf_MoveStockRequestBillEdit.html" />
    <Content Include="views\仓存管理\仓库调拨\Kf_MoveStockRequestBillList.html" />
    <Content Include="views\仓存管理\仓库调拨\Kf_MoveStockStepOutBill_Fast.html" />
    <Content Include="views\仓存管理\分步式调入单\Fb_StepFoldinBillList.html" />
@@ -183,12 +193,39 @@
    <Content Include="views\基础资料\公用基础资料\Gy_ConkType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_PackType.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_PackType.html" />
    <Content Include="views\基础资料\基础资料\Gy_CustLocationEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_CustLocationList.html" />
    <Content Include="views\基础资料\基础资料\Gy_EquipStatus.html" />
    <Content Include="views\基础资料\基础资料\Gy_EquipStatusEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_MatePriceSup.html" />
    <Content Include="views\基础资料\基础资料\Gy_MatePriceSupEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_MouldStatus.html" />
    <Content Include="views\基础资料\基础资料\Gy_MouldStatusEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_Operator.html" />
    <Content Include="views\基础资料\基础资料\Gy_OperatorEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_PaymentConditionEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_COMMONCONTACTEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_COMMONCONTACTList.html" />
    <Content Include="views\基础资料\基础资料\Gy_PropertyEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_RateTypeEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_RateTypeList.html" />
    <Content Include="views\基础资料\基础资料\Gy_SettleStyle.html" />
    <Content Include="views\基础资料\基础资料\Gy_SettleStyleEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_Staff.html" />
    <Content Include="views\基础资料\基础资料\Gy_StaffEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_TaxRateEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_TaxRateList.html" />
    <Content Include="views\基础资料\基础资料\Gy_RecConditionList.html" />
    <Content Include="views\基础资料\基础资料\Gy_StockStatusEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_PaymentConditionList.html" />
    <Content Include="views\基础资料\基础资料\Gy_StockStatusList.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx" />
    <Content Include="views\基础资料\基础资料\Gy_MateMouldList.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_TechnologyParameterUnitList.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_TechnologyParameterUnit_Add_Edit_.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_TechnologyParameter_Add_Edit_.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_TechParamByProcList.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_TechParamByProcList_Add_Edit_.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_TechParamByProc.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkCenterDyCol.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkPayType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkStationList.html" />
@@ -704,6 +741,11 @@
    <Content Include="views\基础资料\基础资料\Gy_RepairList.html" />
    <Content Include="views\基础资料\基础资料\Gy_StockCheckItemEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_StockCheckItemList.html" />
    <Content Include="views\基础资料\基础资料\Gy_RecConditionEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_SupplierContactEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_SupplierContactList.html" />
    <Content Include="views\基础资料\基础资料\Gy_Work.html" />
    <Content Include="views\基础资料\基础资料\Gy_WorkEdit.html" />
    <Content Include="views\基础资料\基础资料\InventoryAnalysis.html" />
    <Content Include="views\基础资料\基础资料\Sc_MouldStockBillMain_Temp.html" />
    <Content Include="views\基础资料\工资基础资料\Add_Edit_Gy_WorkDay.html" />
@@ -792,6 +834,8 @@
    <Content Include="views\模治具管理\器具报表\ReportMaterialReceipt.html" />
    <Content Include="views\模治具管理\器具报表\ReportMouldStock.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldAvailableList.html" />
    <Content Include="views\模治具管理\器具点检规程单\Sc_MouldDotCheckRuleBillEdit.html" />
    <Content Include="views\模治具管理\器具点检规程单\Sc_MouldDotCheckRuleBillList.html" />
    <Content Include="views\模治具管理\器具维修派工单\Sc_MouldRepairSendWorkBillEdit.html" />
    <Content Include="views\模治具管理\器具维修派工单\Sc_MouldRepairSendWorkBillList.html" />
    <Content Include="views\模治具管理\模具处理出库单\Sc_MouldScrapOutBill_PDA.html" />
@@ -804,6 +848,8 @@
    <Content Include="views\模治具管理\模具其他出库单\Sc_MouldOtherOutBill_PDA.html" />
    <Content Include="views\模治具管理\模具其他入库单\Sc_MouldOtherInBill_PDA.html" />
    <Content Include="views\模治具管理\模具采购入库单\Sc_MouldProdInBill_PDA.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_Add_MouldLifeUseBillList.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldLifeUseBillList.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldMoveStockStepOutBill.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldMoveStockStepInBill.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldMoveStockStepInBillList.html" />
@@ -833,14 +879,25 @@
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldProdOutBillList.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldScrapInBillList.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldScrapOutBillList.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldScrapRequestBill.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldScrapRequestBillList.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldStatusChangeBill.html" />
    <Content Include="views\模治具管理\模治具仓库管理\Sc_MouldStatusChangeBillList.html" />
    <Content Include="views\模治具管理\模治具点检保养\Sc_MouldDotCheckBill_PDA.html" />
    <Content Include="views\模治具管理\模治具点检保养\Sc_MouldMaintainBill_PDA.html" />
    <Content Include="views\模治具管理\模治具管理\BatchGen_MouldFile.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_BarCodeBill_Out.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_BarCodeBill_OutList.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_CheckToolsFileMainList.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_MouldFileList.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_MouldFile.html" />
    <Content Include="views\模治具管理\模治具管理\Gy_MouldFileResume.html" />
    <Content Include="views\模治具管理\模治具管理\KF_BarCodeStatusChangeBill.html" />
    <Content Include="views\模治具管理\模治具管理\KF_BarCodeStatusChangeBillList.html" />
    <Content Include="views\模治具管理\模治具管理\Sb_Add_MouldRepairWorkBillList.html" />
    <Content Include="views\生产工序管理\工序汇报单\Sc_ProcessReportList_Last.html" />
    <Content Include="views\设备管理\设备入库检验验收单\Sb_EquipStockInCheckBillEdit.html" />
    <Content Include="views\设备管理\设备入库检验验收单\Sb_EquipStockInCheckBillList.html" />
    <Content Include="views\模治具管理\模治具管理\Sc_Add_MouldConkBookBillList.html" />
    <Content Include="views\模治具管理\模治具管理\Sc_Add_MouldDotCheckBillList.html" />
    <Content Include="views\模治具管理\模治具管理\Sc_Add_MouldDotCheckPlanBillList.html" />
@@ -914,6 +971,7 @@
    <Content Include="views\生产管理\生产上料单\Sc_MaterToSourceBillList - 复制.html" />
    <Content Include="views\生产管理\生产上料单\Sc_MaterToSourceBillList.html" />
    <Content Include="views\生产管理\生产任务单\Sc_ICMOBillEdit.html" />
    <Content Include="views\生产管理\生产任务单\Sc_ICMOBillEdit_NoTable.html" />
    <Content Include="views\生产管理\生产任务单\Sc_ICMOBillImport.html" />
    <Content Include="views\生产管理\生产停工单\Sc_Add_MESStopWorkBillList - 复制.html" />
    <Content Include="views\生产管理\生产停工单\Sc_Add_MESStopWorkBillList.html" />
@@ -930,6 +988,7 @@
    <Content Include="views\生产管理\生产开工单\Sc_Add_MESBeginWorkBillList - 复制.html" />
    <Content Include="views\生产管理\生产开工单\Sc_Add_MESBeginWorkBillList.html" />
    <Content Include="views\生产管理\生产开工单\Sc_MESBeginWorkBillList.html" />
    <Content Include="views\生产管理\生产投料单\Sc_PPBomBill.html" />
    <Content Include="views\生产管理\生产投料单\Sc_PPickingBillList.html" />
    <Content Include="views\生产管理\生产拆箱单\Sc_PackSplitBill_Fast.html" />
    <Content Include="views\生产管理\生产日计划工单\JIT_DayPlanBillEdit.html" />
@@ -1012,9 +1071,21 @@
    <Content Include="views\设备管理\Sb_EquipMaintainPlanBillEdit.html" />
    <Content Include="views\设备管理\Sb_EquipMaintainPlanBillList.html" />
    <Content Include="views\设备管理\Sc_Add_MouldDotCheckBillList.html" />
    <Content Include="views\设备管理\设备入库\Sb_EquipStockInCheckBill.html" />
    <Content Include="views\设备管理\设备入库\Sb_EquipStockInCheckBillList.html" />
    <Content Include="views\设备管理\设备备品备件\Sb_EquipSparepartsBill.html" />
    <Content Include="views\设备管理\设备备品备件\Sb_EquipSparepartsBillList.html" />
    <Content Include="views\设备管理\设备备品备件\Sb_EquipSparepartsChangeBill.html" />
    <Content Include="views\设备管理\设备备品备件\Sb_EquipSparepartsChangeBillList.html" />
    <Content Include="views\设备管理\设备投产检验验收单\Sb_EquipWorkBeforeCheckBillEdit.html" />
    <Content Include="views\设备管理\设备投产检验验收单\Sb_EquipWorkBeforeCheckBillList.html" />
    <Content Include="views\设备管理\设备投产\Sb_EquipWorkBeforeCheckBill.html" />
    <Content Include="views\设备管理\设备投产\Sb_EquipWorkBeforeCheckBillList.html" />
    <Content Include="views\设备管理\设备档案\Gy_EquipFileBillResume.html" />
    <Content Include="views\设备管理\设备档案\Gy_EquipFileMainEdit.html" />
    <Content Include="views\设备管理\设备档案\Gy_EquipFileMainList.html" />
    <Content Include="views\设备管理\设备状态\Sb_EquipStatusChangeBill.html" />
    <Content Include="views\设备管理\设备状态\Sb_EquipStatusChangeBillList.html" />
    <Content Include="views\设备管理\设备维修派工单\Sb_EquipRepairSendWorkBillEdit.html" />
    <Content Include="views\设备管理\设备维修派工单\Sb_EquipRepairSendWorkBillList.html" />
    <Content Include="views\设备管理\设备规程单\Sb_EquipDotCheckRuleEdit.html" />
@@ -1029,6 +1100,7 @@
    <Content Include="views\质量管理\产品入库检验单\QC_LastPieceCheckBillList.html" />
    <Content Include="views\质量管理\出厂检验单\QC_OutCompCheckBillList.html" />
    <Content Include="views\质量管理\巡检记录单\QC_PatrolProcCheckBillList.html" />
    <Content Include="views\质量管理\来料检验单\Kf_SCStockInCheckBill_Fast.html" />
    <Content Include="views\质量管理\来料检验单\Kf_QCStockInCheckBill_Fast.html" />
    <Content Include="views\质量管理\来料检验单\QC_Add_Edit_POStockInCheckBillList.html" />
    <Content Include="views\质量管理\来料检验单\QC_Add_Edit_POStockInCheckBill.html" />
@@ -1075,6 +1147,7 @@
    <Content Include="views\车间管理\车间收料\JIT_SendGoodsBillList.html" />
    <Content Include="views\采购管理\收料通知单\Add_Edit_Cg_POInStockBillList.html" />
    <Content Include="views\采购管理\退料通知单\Add_Edit_Cg_POInStockBackBillList.html" />
    <Content Include="views\采购管理\采购订单\Cg_POOrderBillEdit.html" />
    <Content Include="views\采购管理\采购订单\Cg_POOrderBillList.html" />
    <Content Include="views\采购管理\采购退料单\Cg_PurchaseReturnList.html" />
    <Content Include="views\采购管理\采购退料单\Cg_PurchaseReturn_Add_Up.html" />
@@ -1086,9 +1159,16 @@
    <Content Include="views\领料发货\其他出库\Kf_OtherOutBill_Check.html" />
    <Content Include="views\领料发货\分步式调出单\Fb_StepFoldOutBillList.html" />
    <Content Include="views\领料发货\委外出库\Kf_EntrustOutBillList.html" />
    <Content Include="views\领料发货\委外出库\Kf_EntrustOutBill_Check_New.html" />
    <Content Include="views\领料发货\委外出库\Kf_EntrustOutBill_CheckList_New.html" />
    <Content Include="views\领料发货\委外补料\Kf_EntrustReplenishOutBill_Check_New.html" />
    <Content Include="views\领料发货\委外补料\Kf_EntrustReplenishOutBill_CheckList_New.html" />
    <Content Include="views\领料发货\收料入库\Kf_ReciveBill_Check.html" />
    <Content Include="views\领料发货\收料入库\Kf_ReciveBill_Fast_AR.html" />
    <Content Include="views\领料发货\收料入库\Kf_ReciveBill_Fast.html" />
    <Content Include="views\领料发货\生产补料\Kf_MateReplenishOutBill_Check_New.html" />
    <Content Include="views\领料发货\生产补料\Kf_MateReplenishOutBill_CheckList_New.html" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBill_CheckList_New.html" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBill_Check_New.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutBackBillEdit.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutBackBill_Fast.html" />
@@ -1097,6 +1177,8 @@
    <Content Include="views\领料发货\领料出库\Kf_MateOutBill_FastCheck.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutBill_CheckList_New.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutBill_Check_New.html" />
    <Content Include="views\领料发货\领料出库\Kf_StockOutRequestBill.html" />
    <Content Include="views\领料发货\领料出库\Kf_StockOutRequestBillList.html" />
    <Content Include="views\验收入库\产品入库\Kf_ICStockBillSub_WMS_List.html" />
    <Content Include="views\验收入库\产品入库\Kf_ProductInBillList.html" />
    <Content Include="views\验收入库\其他入库\Kf_OtherInBillList.html" />
@@ -1470,6 +1552,13 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Sc_ProcessExchangeBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx.cs">
      <DependentUpon>xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Sc_ProcessExchangeBillList_SubList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\生产工序管理\工序汇报单\xmlLBM_ProcessReport.aspx.cs">
      <DependentUpon>xmlLBM_ProcessReport.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>