合并分支

chenhaozhe

2025-05-21 e50265de5ae4e5e4c8b8852e777216adab7c4ce4

 WebTM/WebTM.csproj

@@ -336,8 +336,10 @@
    <Content Include="views\WMS扫码模块\生产补料\Kf_MateReplenishOutBill_PDA.html" />
    <Content Include="views\WMS扫码模块\生产补料\Kf_MateReplenishOutBill_CheckList_PDA.html" />
    <Content Include="views\WMS扫码模块\生产调拨\Kf_MoveStockBillList_Mould_PDA.html" />
    <Content Include="views\WMS扫码模块\生产调拨\Kf_MoveStockBillList_PDA_XiaBao.html" />
    <Content Include="views\WMS扫码模块\生产调拨\Kf_MoveStockBill_CusBar_PDA.html" />
    <Content Include="views\WMS扫码模块\生产调拨\Kf_MoveStockBill_Mould_PDA.html" />
    <Content Include="views\WMS扫码模块\生产调拨\Kf_MoveStockBill_PDA_XiaBao.html" />
    <Content Include="views\WMS扫码模块\生产调拨\Kf_MoveStockStepInBill_Mould_PDA.html" />
    <Content Include="views\WMS扫码模块\生产调拨\Kf_MoveStockStepInBill_PDA.html" />
    <Content Include="views\WMS扫码模块\生产调拨\Kf_MoveStockStepOutBillList_Mould_PDA.html" />
@@ -593,7 +595,11 @@
    <Content Include="views\模治具管理\模治具管理\Sc_MouldMaintainRuleBill_Excel.html" />
    <Content Include="views\模治具管理\模治具管理\Sc_MouldMaintainRuleBillList_PDA.html" />
    <Content Include="views\生产管理\三升排产\JIT_DayPlanPlatForm.html" />
    <Content Include="views\生产管理\宝工排产\JIT_DayPlanPlatForm_New.html" />
    <Content Include="views\生产管理\三升排产\JIT_DayPlanPlatFormImport_SS_Sec.html" />
    <Content Include="views\生产管理\三升排产\JIT_DayPlanPlatFormImport_SS.html" />
    <Content Include="views\生产管理\宝工排产\Cg_PODemandPlanConfigBillReportForLack.html" />
    <Content Include="views\生产管理\宝工排产\Gy_RoutingBillReportForLack.html" />
    <Content Include="views\生产管理\宝工排产\JIT_NeedMaterPlanConfigBillReportForLack.html" />
    <Content Include="views\生产管理\宝工排产\JIT_PickUpCalculate_BaoGong.html" />
    <Content Include="views\生产管理\宝工排产\JIT_UnLockRequestBillList.html" />
    <Content Include="views\生产管理\宝工排产\JIT_UnLockRequestBill.html" />
@@ -615,6 +621,8 @@
    <Content Include="views\生产管理\报工平台_PDA\质量汇报\Sc_QualityReportBill_PDA.html" />
    <Content Include="views\生产管理\报工平台功能页\Gy_ButtonList.html" />
    <Content Include="views\生产管理\报工平台功能页\LineBind_Button.html" />
    <Content Include="views\生产管理\日计划基础资料\JIT_NeedMaterPlanConfigBill_Excel.html" />
    <Content Include="views\生产管理\日计划报表\JIT_FuHeFenXiReportDetail.html" />
    <Content Include="views\生产管理\欠料运算\JIT_MaterialLevelShorAnalysis.html" />
    <Content Include="views\生产管理\欠料运算\JIT_MaterialLevelShorAnalysisDetailReport.html" />
    <Content Include="views\生产管理\欠料运算\JIT_MaterialLevelShorAnalysisReport.html" />
@@ -631,6 +639,7 @@
    <Content Include="views\生产管理\生产报表\Sc_QualityReportBillMonth.html" />
    <Content Include="views\生产管理\生产报表\Sc_QualityReportBillDay.html" />
    <Content Include="views\生产管理\生产物料清单\sc_Gy_ICBomBillEdit.html" />
    <Content Include="views\生产管理\生产计划平台\JIT_DayPlanPlatForm_TKNew.html" />
    <Content Include="views\生产管理\生产计划平台\JIT_DayPlanPlatForm_TK.html" />
    <Content Include="views\生产管理\生产计划平台\JIT_DayPlanPlatForm_BCP.html" />
    <Content Include="views\生产管理\订单状态分布\Sc_EquipmentProcessList.html" />
@@ -638,6 +647,7 @@
    <Content Include="views\生产管理\生产计划平台\Sc_BulkEditWorkTime.html" />
    <Content Include="views\生产管理\质量汇报单\Sc_QualityReportBill_PDA.html" />
    <Content Include="views\生产管理\质量汇报单\Sc_QualityReportBillSumSave.html" />
    <Content Include="views\生产管理\返修码绑定\Sc_RepairCodeBinding.html" />
    <Content Include="views\看板\采购收料\KB_CGSL.html" />
    <Content Include="views\看板\销售发货\KB_XSFH.html" />
    <Content Include="views\系统管理\会计期间\Xt_AccountPeriodAdd.html" />