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

yangle

2022-11-30 3b5b27c8efa2bfb66eec07a1efd7a1f47cc029e6

 WebTM/WebTM.csproj

@@ -79,6 +79,7 @@
    <Content Include="layuiadmin\layui\images\device.png" />
    <Content Include="layuiadmin\layui\images\erro.png" />
    <Content Include="layuiadmin\layui\layui.js" />
    <Content Include="layuiadmin\layui\layui1.js" />
    <Content Include="layuiadmin\layui\zgqlayui.js" />
    <Content Include="layuiadmin\modules\excel.js" />
    <Content Include="layuiadmin\modules\soulTable.js" />
@@ -110,12 +111,17 @@
    <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_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" />
@@ -138,6 +144,7 @@
    <Content Include="views\index - 复制.html" />
    <Content Include="views\indexMenu.html" />
    <Content Include="views\IpadStepIndex.html" />
    <Content Include="views\PublicPage\MaterialInfo.html" />
    <Content Include="views\PublicPage\MouldDotCheckRuleInterList.html" />
    <Content Include="views\PublicPage\MouldMaintainRuleInterList.html" />
    <Content Include="views\PublicPage\OrderBackInfomation.html" />
@@ -170,17 +177,23 @@
    <Content Include="views\仓存管理\条码库存\KF_ICInventoryByMaterID.html" />
    <Content Include="views\仓存管理\条码库存\KF_ICInventoryList_WMS.html" />
    <Content Include="views\仓存管理\条码生成\Gy_BarCodeBill.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_ConkType.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_OrderBackInfo.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_OrderLev.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_WorkPayType.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_WorkStationList.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_WorkType.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Pay_PeriodInfoSet.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_ConkType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_PackType.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_PackType.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" />
@@ -698,6 +711,8 @@
    <Content Include="views\基础资料\基础资料\Gy_StockCheckItemList.html" />
    <Content Include="views\基础资料\基础资料\InventoryAnalysis.html" />
    <Content Include="views\基础资料\基础资料\Sc_MouldStockBillMain_Temp.html" />
    <Content Include="views\基础资料\工资基础资料\Add_Edit_Gy_WorkDay.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_WorkDay.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_ProcPriceList.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_Group_Add_Edit.html" />
    <Content Include="views\基础资料\工资基础资料\Gy_ProcPrice.html" />
@@ -708,6 +723,9 @@
    <Content Include="views\基础资料\数据字典\Xt_DataDictionary_ViewList.html" />
    <Content Include="views\基础资料\数据字典\Xt_DataDictionary_TableList.html" />
    <Content Include="views\基础资料\生产基础资料\Add_Edit_Gy_Process.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_SOPBill.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_SOPBillEdit.html" />
    <Content Include="views\基础资料\生产基础资料\Gy_SOPBillList.html" />
    <Content Include="views\基础资料\采购基础资料\Gy_Supplier_Edit.html" />
    <Content Include="views\基础资料\销售基础资料\Gy_Customer_Edit.html" />
    <Content Include="views\基础资料\公用基础资料\Xt_ORGANIZATIONSList.html" />
@@ -900,12 +918,17 @@
    <Content Include="views\生产管理\日计划报表\ReportWorkDemandPlanBillList.html" />
    <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" />
    <Content Include="views\生产管理\生产停工单\Sc_MESStopWorkBillList.html" />
    <Content Include="views\生产管理\生产包装单\Sc_PackUnionBill.html" />
    <Content Include="views\生产管理\生产包装单\Sc_PackUnionBillEdit.html" />
    <Content Include="views\生产管理\生产叫料平台\JIT_ComplementGoodBillMain.html" />
    <Content Include="views\生产管理\生产叫料平台\JIT_ComplementGoodBillMain_ZXBZ.html" />
    <Content Include="views\生产管理\生产叫料平台\JIT_ComplementGoodPT.html" />
    <Content Include="views\生产管理\生产叫料平台\JIT_HlpBillList.html" />
    <Content Include="views\生产管理\生产完工单\Sc_Add_MESEndWorkBillList - 复制.html" />
    <Content Include="views\生产管理\生产完工单\Sc_Add_MESEndWorkBillList.html" />
@@ -944,6 +967,11 @@
    <Content Include="views\系统管理\公告\GG_NoticeBillEdit.html" />
    <Content Include="views\系统管理\单据类型\Xt_BillType_Edit.html" />
    <Content Include="views\系统管理\单据类型\Xt_BillTypeList.html" />
    <Content Include="views\系统管理\多级审批\审核流程单\Xt_CheckFlowEdit.html" />
    <Content Include="views\系统管理\多级审批\审核流程单\Xt_CheckFlowList.html" />
    <Content Include="views\系统管理\多级审批\审核流程单\Xt_CheckUserRight.html" />
    <Content Include="views\系统管理\多级审批\审核项目\Xt_CheckItemEdit.html" />
    <Content Include="views\系统管理\多级审批\审核项目\Xt_CheckItemList.html" />
    <Content Include="views\系统管理\日志管理\Xt_SystemLogList.html" />
    <Content Include="views\系统管理\模块管理\Xt_Xtgnb_Edit.html" />
    <Content Include="views\系统管理\模块管理\Xt_XtgnbList.html" />
@@ -957,11 +985,14 @@
    <Content Include="views\系统管理\用户管理\Gy_UserMater.html" />
    <Content Include="views\系统管理\用户管理\Gy_UserStock.html" />
    <Content Include="views\系统管理\用户管理\Xt_UserGroupList.html" />
    <Content Include="views\系统管理\用户管理\Xt_UserGroupListEdit.html" />
    <Content Include="views\系统管理\用户管理\Xt_UserList.html" />
    <Content Include="views\系统管理\用户管理\Xt_UserListEdit.html" />
    <Content Include="views\系统管理\用户管理\Xt_UserSuplies.html" />
    <Content Include="views\系统管理\系统参数管理\Xt_SystemParameter_Edit.html" />
    <Content Include="views\系统管理\系统参数管理\Xt_SystemParameterList.html" />
    <Content Include="views\系统管理\组织架构设置\Gy_DutyEdit.html" />
    <Content Include="views\系统管理\组织架构设置\Gy_DutyList.html" />
    <Content Include="views\组装单\Sc_PCruxBindingPDA.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBill.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillimport.html" />
@@ -997,12 +1028,15 @@
    <Content Include="views\设备管理\Sb_EquipMaintainBillList_MulEdit.html" />
    <Content Include="views\设备管理\设备规程单\Sb_EquipMaintainRuleEdit.html" />
    <Content Include="views\设备管理\设备规程单\Sb_EquipMaintainRuleList.html" />
    <Content Include="views\质量管理\产品入库检验单\Kf_ProductInCheckBill_Fast.html" />
    <Content Include="views\质量管理\出厂检验单\QC_OutCompCheckBill.html" />
    <Content Include="views\质量管理\巡检记录单\QC_Add_Edit_PatrolProcCheckBill.html" />
    <Content Include="views\质量管理\产品入库检验单\QC_LastPieceCheckBill.html" />
    <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" />
    <Content Include="views\质量管理\工序检验单\QC_ProcessCheckBill.html" />
@@ -1061,6 +1095,10 @@
    <Content Include="views\领料发货\委外出库\Kf_EntrustOutBillList.html" />
    <Content Include="views\领料发货\收料入库\Kf_ReciveBill_Check.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" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutBillLEdit.html" />
@@ -1068,6 +1106,7 @@
    <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_ICStockBillSub_WMS_List.html" />
    <Content Include="views\验收入库\产品入库\Kf_ProductInBillList.html" />
    <Content Include="views\验收入库\其他入库\Kf_OtherInBillList.html" />
    <Content Include="views\模治具管理\模治具管理\Kf_ProductInBillList.html" />
@@ -1440,6 +1479,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>
@@ -1449,6 +1495,7 @@
    </Compile>
  </ItemGroup>
  <ItemGroup>
    <Folder Include="Files\" />
    <Folder Include="views\仓存管理\调拨单核对\" />
    <Folder Include="views\仓存管理\调拨单稽核\" />
  </ItemGroup>