From 2c50f753e6bf30be69281dcd4f78b72c2de35d6a Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期四, 25 一月 2024 10:42:42 +0800
Subject: [PATCH] 销售订单:子表增加 是否取库存 字段,下推生产订单带出字段

---
 WebTM/WebTM.csproj |   32 +++++++++++++++++++++++++++++++-
 1 files changed, 31 insertions(+), 1 deletions(-)

diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 286e85d..694df97 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -93,6 +93,8 @@
     <Content Include="layuiadmin\layui\images\erro.png" />
     <Content Include="layuiadmin\layui\layui.js" />
     <Content Include="layuiadmin\layui\layui1.js" />
+    <Content Include="layuiadmin\layui\lay\modules\table-鍓湰.js" />
+    <Content Include="layuiadmin\layui\lay\modules\table.js" />
     <Content Include="layuiadmin\layui\zgqlayui.js" />
     <Content Include="layuiadmin\lib\extend\echarts.min.js" />
     <Content Include="layuiadmin\lineBreakTransformer.js" />
@@ -307,6 +309,7 @@
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\HBarPlanPrint_GXPG.html" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_SellOutBillList.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_SellOutBillList_BarCodeNote.aspx" />
+    <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPOInStockBackBill.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ICMOChangeBillList.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcessExchangeArrangement.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_MateOutBillList.aspx" />
@@ -321,16 +324,24 @@
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Xs_SeOrderBill.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Xs_SeOrderChangeBillList.aspx" />
     <Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheckList_PDA.html" />
+    <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ClassTimePrjGroupEdit.html" />
+    <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ClassTimePrjEdit.html" />
+    <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ClassTimePrjGroupList.html" />
     <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcCommPrice.html" />
     <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcCommPriceList.html" />
+    <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ClassTimePrjList.html" />
     <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Add_Edit_Gy_Post.html" />
     <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Add_Edit_Gy_PostSkillList.html" />
     <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Add_Edit_Gy_BadResult.html" />
     <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Add_Edit_Gy_BadType.html" />
+    <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Add_Edit_Gy_DisposeWay.html" />
+    <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Add_Edit_Gy_ScrapReason.html" />
     <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_Post.html" />
     <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_PostSkillList.html" />
     <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_BadResult.html" />
     <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_BadType.html" />
+    <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_DisposeWayList.html" />
+    <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_ScrapReasonList.html" />
     <Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_Souce_Excel.html" />
     <Content Include="views\宸ヨ祫绠$悊\鍔犵彮鐢宠\Pay_OverApplyBill.html" />
     <Content Include="views\宸ヨ祫绠$悊\鍔犵彮鐢宠\Pay_OverApplyBillList.html" />
@@ -352,6 +363,8 @@
     <Content Include="views\宸ヨ祫绠$悊\鑰冨嫟姹囨姤鍗昞Pay_WorkTimesSumQueryBillList.html" />
     <Content Include="views\宸ヨ祫绠$悊\璇峰亣鐢宠\Pay_OutApplyBill.html" />
     <Content Include="views\宸ヨ祫绠$悊\璇峰亣鐢宠\Pay_OutApplyBillList.html" />
+    <Content Include="views\搴旀敹绠$悊\鎶ヨ〃鍒嗘瀽\YS_ContactBalReport_ImportByExcel.html" />
+    <Content Include="views\搴旀敹绠$悊\鎶ヨ〃鍒嗘瀽\YS_ContactBalReport.html" />
     <Content Include="views\搴旀敹绠$悊\鎶ヨ〃鍒嗘瀽\YS_CusShouldIncomeEntryReport.html" />
     <Content Include="views\搴旀敹绠$悊\鎶ヨ〃鍒嗘瀽\YS_CusShouldIncomeReport.html" />
     <Content Include="views\鏉$爜鏄庣粏\Kf_BarCodeDetailQuery.html" />
@@ -380,16 +393,22 @@
     <Content Include="views\绯荤粺绠$悊\蹇嵎鏂瑰紡鑷畾涔塡Xt_UserFastMenu.html" />
     <Content Include="views\绯荤粺绠$悊\蹇嵎鏂瑰紡鑷畾涔塡Xt_UserFastMenu_IconSet.html" />
     <Content Include="views\绯荤粺绠$悊\鎸夐挳璁剧疆\Xt_ModuleButtonSet.html" />
+    <Content Include="views\绯荤粺绠$悊\鐢ㄦ埛绠$悊\Gy_UserByUserList.html" />
+    <Content Include="views\绯荤粺绠$悊\鐢ㄦ埛绠$悊\Gy_UserByWorkStationList.html" />
     <Content Include="views\绯荤粺绠$悊\鐢ㄦ埛绠$悊\Gy_UserCustomerList.html" />
     <Content Include="views\绯荤粺绠$悊\鐢ㄦ埛绠$悊\Gy_UserCustomerList_Edit.html" />
+    <Content Include="views\绯荤粺绠$悊\鐢ㄦ埛绠$悊\Gy_UserGroupList.html" />
     <Content Include="views\绯荤粺绠$悊\鐢ㄦ埛绠$悊\Gy_UserMaterList.html" />
     <Content Include="views\绯荤粺绠$悊\鐢ㄦ埛绠$悊\Gy_UserStockRelation.html" />
     <Content Include="views\绯荤粺绠$悊\鐢ㄦ埛绠$悊\Gy_UserProcessList.html" />
     <Content Include="views\绯荤粺绠$悊\鐢ㄦ埛绠$悊\Gy_UserCustomer_ImportByExcel.html" />
     <Content Include="views\绯荤粺绠$悊\鐢ㄦ埛绠$悊\Gy_UserEmployee_Excel.html" />
     <Content Include="views\绯荤粺绠$悊\鐢ㄦ埛绠$悊\Gy_UserProcess_Excel.html" />
+    <Content Include="views\绯荤粺绠$悊\鐢ㄦ埛绠$悊\Xt_UserSupliesList.html" />
     <Content Include="views\绯荤粺绠$悊\鐢ㄦ埛绠$悊\Xt_UserSuplies_Excel.html" />
     <Content Include="views\绯荤粺绠$悊\鑿滃崟鑷畾涔塡Xt_DefineMenuDisplay.html" />
+    <Content Include="views\绯荤粺绠$悊\杩囨护鏂规璁剧疆\Xt_FastICScheme.html" />
+    <Content Include="views\绯荤粺绠$悊\杩囨护鏂规璁剧疆\Xt_FastICSchemeList.html" />
     <Content Include="views\璁″垝绠$悊\浜х嚎璐ㄦ骞冲彴\Sc_ICMOBillQualityStatus_Tmp.html" />
     <Content Include="views\璁″垝绠$悊\浜х嚎杩斾慨骞冲彴\Sc_SourceLineRepairBill.html" />
     <Content Include="views\璁″垝绠$悊\浜х嚎杩斾慨骞冲彴\Sc_SourceLineRepairBill_ChangeMater.html" />
@@ -436,7 +455,9 @@
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆\MES_Sc_ProcessExchangeBillMain_Note_PDA.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆\MES_StationInBillList_PDA_QiaoYi.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆\MES_StationOutBillList_PDA_QiaoYi.html" />
+    <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Gy_ProcessBatchReport.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBillList_LookDown.html" />
+    <Content Include="views\杞﹂棿绠$悊\宸ュ簭娴佽浆鍗SingleRowWallList.html" />
     <Content Include="views\杞﹂棿绠$悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Cj_StationInBillList_QiaoYi.html" />
     <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Sc_BadReasonReport.html" />
     <Content Include="views\杞﹂棿绠$悊\鎶ヨ〃鍒嗘瀽\Sc_ProcessErrStationReport.html" />
@@ -641,6 +662,8 @@
     <Content Include="views\grf\閿�鍞鍗曞彉鏇村崟2.grf" />
     <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>
@@ -807,7 +830,6 @@
     <Content Include="layuiadmin\layui\lay\modules\mobile\zepto.js" />
     <Content Include="layuiadmin\layui\lay\modules\rate.js" />
     <Content Include="layuiadmin\layui\lay\modules\slider.js" />
-    <Content Include="layuiadmin\layui\lay\modules\table.js" />
     <Content Include="layuiadmin\layui\lay\modules\tree.js" />
     <Content Include="layuiadmin\layui\lay\modules\upload.js" />
     <Content Include="layuiadmin\layui\lay\modules\util.js" />
@@ -1556,6 +1578,7 @@
     <Content Include="views\椤圭洰绠$悊\鎶ヨ〃鍒嗘瀽\PM_WorkTaskReportMonthSumReport.html" />
     <Content Include="views\椤圭洰绠$悊\鎶ヨ〃鍒嗘瀽\PM_ProjectWorkDaysSumReport.html" />
     <Content Include="views\椤圭洰绠$悊\鎶ヨ〃鍒嗘瀽\PM_ProjectWorkDaysEntryReport.html" />
+    <Content Include="views\椤圭洰绠$悊\鎶ヨ〃鍒嗘瀽\PM_ProjectBillMainMy.html" />
     <Content Include="views\椤圭洰绠$悊\椤圭洰闃舵\Add_Edit_Gy_ProjectStage.html" />
     <Content Include="views\椤圭洰绠$悊\椤圭洰闃舵\Gy_ProjectStage.html" />
     <Content Include="views\椤圭洰绠$悊\椤圭洰闃舵\PM_ProjectReportBillList.html" />
@@ -1738,6 +1761,13 @@
     <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Kf_SellOutBillList_BarCodeNote.aspx.designer.cs">
       <DependentUpon>xmlLBM_Kf_SellOutBillList_BarCodeNote.aspx</DependentUpon>
     </Compile>
+    <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPOInStockBackBill.aspx.cs">
+      <DependentUpon>xmlLBM_HPOInStockBackBill.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_HPOInStockBackBill.aspx.designer.cs">
+      <DependentUpon>xmlLBM_HPOInStockBackBill.aspx</DependentUpon>
+    </Compile>
     <Compile Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ICMOChangeBillList.aspx.cs">
       <DependentUpon>xmlLBM_Sc_ICMOChangeBillList.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>

--
Gitblit v1.9.1