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

yusijie

2025-07-31 839331752af8dcc1ecb19d17feaa514710cf9751

 WebTM/WebTM.csproj

@@ -138,6 +138,7 @@
    <Content Include="layuiadmin\layui\font\iconfont.woff" />
    <Content Include="layuiadmin\layui\font\iconfont.woff2" />
    <Content Include="layuiadmin\json\Test.json" />
    <Content Include="Download\WMS软件安装包.apk" />
    <None Include="Properties\PublishProfiles\JFTM.pubxml" />
    <Content Include="layuiadmin\layui\images\device.png" />
    <Content Include="layuiadmin\layui\images\erro.png" />
@@ -393,6 +394,8 @@
    <Content Include="views\WMS扫码模块\生产管理\生产组托单\Sc_PackUnionBill_PDA.html" />
    <Content Include="views\WMS扫码模块\生产调拨\调拨换托\Kf_MoveStockBill_HuanTuo_PDA.html" />
    <Content Include="views\WMS扫码模块\生产调拨\调拨换托\Kf_MoveStockBillList_HuanTuo_PDA.html" />
    <Content Include="views\WMS扫码模块\销售出库\Kf_SellOutBillList_YP_QiaoYi_PDA.html" />
    <Content Include="views\WMS扫码模块\销售出库\Kf_SellOutBill_YP_QiaoYi_PDA.html" />
    <Content Include="views\WMS扫码模块\销售出库\Kf_SellOutBackBill_PDA.html" />
    <Content Include="views\WMS扫码模块\销售出库\Kf_SellOutBill_CheckList_PDA.html" />
    <Content Include="views\WMS扫码模块\销售出库\Kf_SellOutBill_Check_PDA.html" />
@@ -429,6 +432,7 @@
    <Content Include="views\人事管理\职员异动单\HR_EmpChangeBillList.html" />
    <Content Include="views\仓存管理\条码报表\Kf_ICInvBalList.html" />
    <Content Include="views\仓存管理\条码生成\Gy_BarCodeBill_JiaNan.html" />
    <Content Include="views\仓存管理\条码生成\Gy_BarCodeBill_JiaNan_AutoLogin.html" />
    <Content Include="views\仓存管理\生产入库单\Kf_ProductInBillList.html" />
    <Content Include="views\仓存管理\组托单\Sc_PackUnionBillMain_Setto.html" />
    <Content Include="views\仓存管理\装箱单\Sc_PackUnionBillMain_Packing.html" />
@@ -461,6 +465,7 @@
    <Content Include="views\基础资料\公用基础资料\excel\Gy_QualityStd_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_AreaSet_ExtendDoubleClickReturn.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_BadPhenomena_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_BarCodeReport.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_PNLInfoEdit.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_BarCodeBill_PNL_TempEdit.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_PNLInfoList.html" />
@@ -498,6 +503,8 @@
    <Content Include="views\基础资料\公用基础资料\Gy_WorkCenter_Excel.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_UnitConvertRateList.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Gy_StockPlaceList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Kf_BarCodeDetailQuery.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Kf_MoveStockBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_CustTagBarCodeList_Select.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Sc_CustTagBarCodeList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HPayMentBill.aspx" />
@@ -517,6 +524,8 @@
    <Content Include="views\基础资料\公用基础资料\xmlLBM_HPOOrderChangeBillList.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_Xs_SeOrderBill_StockInCodeNote.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlSRM_Web_BarCodeBillList.aspx" />
    <Content Include="views\基础资料\基础资料\Gy_MatePrice.html" />
    <Content Include="views\基础资料\基础资料\Gy_MatePriceEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_PatrolCheckItemMethod_Excel.html" />
    <Content Include="views\基础资料\基础资料\Gy_PatrolCheckItemClass_Excel.html" />
    <Content Include="views\基础资料\基础资料\Gy_PatrolCheck_Excel.html" />
@@ -643,6 +652,7 @@
    <Content Include="views\生产管理\发货计划平台（三升）\Xs_SendGoodsPlanImport.html" />
    <Content Include="views\生产管理\宝工排产\Cg_PODemandPlanConfigBillReportForLack.html" />
    <Content Include="views\生产管理\宝工排产\Gy_RoutingBillReportForLack.html" />
    <Content Include="views\生产管理\宝工排产\JIT_DayPlanPlatForm_DayImport.html" />
    <Content Include="views\生产管理\宝工排产\JIT_NeedMaterPlanConfigBillReportForLack.html" />
    <Content Include="views\生产管理\宝工排产\JIT_PickUpCalculate_BaoGong.html" />
    <Content Include="views\生产管理\宝工排产\JIT_UnLockRequestBillList.html" />
@@ -945,6 +955,7 @@
    <Content Include="views\销售管理\销售报表\Xs_SeOrderOutStockSumReport_QX.html" />
    <Content Include="views\销售管理\销售报表\Xs_SeOrderOutStockSumReport.html" />
    <Content Include="views\销售管理\销售核销\XS_SellOutBillList_Sec.html" />
    <Content Include="views\销售管理\销售订单\Xs_SeOrderBillList_YP.html" />
    <Content Include="views\销售管理\销售订单\Xs_SeOrderBillQuery.html" />
    <Content Include="views\项目管理\基础建模\Add_Edit_PM_CustomerProInfoBill.html" />
    <Content Include="views\项目管理\基础建模\Add_Edit_Gy_TaskClass.html" />
@@ -2452,12 +2463,14 @@
    <Content Include="views\领料发货\生产补料\Kf_MateReplenishOutBill_CheckList_New.html" />
    <Content Include="views\领料发货\生产领料\Kf_ProductReceiveMaterialBillEdit.html" />
    <Content Include="views\领料发货\生产领料\Kf_ProductReceiveMaterialBillList.html" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBillList_YP.html" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBillQuery.html" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBill.html" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBillList_LookDown.html" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBill_CheckList_New.html" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBill_Check_New.html" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBillList_BarCodeNote.html" />
    <Content Include="views\领料发货\销售出库\Kf_SellOutBill_QiaoYi.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutRequestBill.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutBackBillEdit.html" />
    <Content Include="views\领料发货\领料出库\Kf_MateOutBackBill_Fast.html" />
@@ -2616,6 +2629,20 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Gy_StockPlaceList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Gy_StockPlaceList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Kf_BarCodeDetailQuery.aspx.cs">
      <DependentUpon>xmlLBM_Kf_BarCodeDetailQuery.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Kf_BarCodeDetailQuery.aspx.designer.cs">
      <DependentUpon>xmlLBM_Kf_BarCodeDetailQuery.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Kf_MoveStockBillList.aspx.cs">
      <DependentUpon>xmlLBM_Kf_MoveStockBillList.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Kf_MoveStockBillList.aspx.designer.cs">
      <DependentUpon>xmlLBM_Kf_MoveStockBillList.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_Sc_CustTagBarCodeList_Select.aspx.cs">
      <DependentUpon>xmlLBM_Sc_CustTagBarCodeList_Select.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>