From 10e691d444e56b360e76e79de46cd937045c52e9 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期四, 10 七月 2025 11:14:35 +0800
Subject: [PATCH] 销售订单：价税合计改为 数量*含税单价
---
WebTM/WebTM.csproj | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index ae74ea3..47b1268 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -88,7 +88,6 @@
<Content Include="HtmlPage1.html" />
<Content Include="img\AI鑺墖.png" />
<Content Include="img\ic鑺墖.png" />
- <Content Include="img\鍗庤繙鐩存柟鍥捐儗鏅�.jpeg" />
<Content Include="img\鏅鸿兘鑺墖.png" />
<Content Include="img\鏅鸿兘鑺墖锛�.png" />
<Content Include="img\鐢靛瓙鎶�鏈�.png" />
@@ -174,6 +173,7 @@
<Content Include="layuiadmin\PubCustom.js" />
<Content Include="layuiadmin\PubJs\PubCheck.js" />
<Content Include="layuiadmin\HideButton_New.js" />
+ <Content Include="layuiadmin\zy_dropdown.js" />
<Content Include="views\Baseset\HBarPlanPrint.html" />
<Content Include="views\Baseset\SRM_OpenTmpList_GXPG.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_BadCountDevelopWHList.html" />
@@ -336,6 +336,8 @@
<Content Include="views\WMS鎵爜妯″潡\鎵捐揣涓婃灦鍗昞Kf_MaterialUpperBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鎵捐揣涓嬫灦鍗昞Kf_MaterialLowerBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鎵捐揣涓嬫灦鍗昞Kf_MaterialLowerBillList_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鏀舵枡閫氱煡鍗昣鏉＄爜鐢熸垚\Add_Cg_POInStockBill_BarCore.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鏀舵枡閫氱煡鍗昣鏉＄爜鐢熸垚\Cg_POInStockBill_BarCore.html" />
<Content Include="views\WMS鎵爜妯″潡\鏉＄爜鍑哄叆搴撴煡璇Gy_BarCodeBillInOut__PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\濮斿棰嗘枡\Kf_EntrustOutBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鏉＄爜鏌ヨ\Gy_BarCodeBill_QiaoYi_PDA.html" />
@@ -346,6 +348,10 @@
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇鍏ュ簱\Kf_ProductInBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇姹囨姤\Sc_ICMOReportBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇姹囨姤\Sc_ICMOReportBillList_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鐢熶骇绠＄悊\鍒犳墭鍗昞Sc_UnPackUnionBill_Pallet_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鐢熶骇绠＄悊\鍒犳墭鍗昞Sc_UnPackUnionBill_Packing_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鐢熶骇绠＄悊\鐢熶骇缁勬墭鍗昞Sc_PackUnionBill_Pallet_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鐢熶骇绠＄悊\鐢熶骇缁勬墭鍗昞Sc_PackUnionBill_Packing_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇琛ユ枡\Kf_MateReplenishOutBill_Check_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇琛ユ枡\Kf_MateReplenishOutBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇琛ユ枡\Kf_MateReplenishOutBill_PDA.html" />
@@ -403,6 +409,7 @@
<Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Add_Edit_Kf_MoveStockBill.html" />
<Content Include="views\浠撳瓨绠＄悊\鍒嗘寮忚皟鍏ュ崟\Fb_StepFoldinBillEdit.html" />
<Content Include="views\浠撳瓨绠＄悊\鏉＄爜搴撳瓨\KF_PonderationBillMain_Temp.html" />
+ <Content Include="views\浠撳瓨绠＄悊\鏉＄爜鎶ヨ〃\Kf_StockInOutEntryByPageReport.html" />
<Content Include="views\浠撳瓨绠＄悊\鏉＄爜鎶ヨ〃\KF_StockInOutEntryReport.html" />
<Content Include="views\浠撳瓨绠＄悊\鏉＄爜鎶ヨ〃\KF_StockInOutRecordReport.html" />
<Content Include="views\浠撳瓨绠＄悊\鏉＄爜鎶ヨ〃\Kf_SellOutBarTraceReport.html" />
@@ -419,7 +426,10 @@
<Content Include="views\浜轰簨绠＄悊\鑱屽憳寮傚姩鍗昞HR_EmpChangeBill.html" />
<Content Include="views\浜轰簨绠＄悊\鑱屽憳寮傚姩鍗昞HR_EmpChangeBillList.html" />
<Content Include="views\浠撳瓨绠＄悊\鏉＄爜鎶ヨ〃\Kf_ICInvBalList.html" />
+ <Content Include="views\浠撳瓨绠＄悊\鏉＄爜鐢熸垚\Gy_BarCodeBill_JiaNan.html" />
<Content Include="views\浠撳瓨绠＄悊\鐢熶骇鍏ュ簱鍗昞Kf_ProductInBillList.html" />
+ <Content Include="views\浠撳瓨绠＄悊\缁勬墭鍗昞Sc_PackUnionBillMain_Setto.html" />
+ <Content Include="views\浠撳瓨绠＄悊\瑁呯鍗昞Sc_PackUnionBillMain_Packing.html" />
<Content Include="views\鍏叡椤甸潰\Kf_ChaoBaoEditDlg.html" />
<Content Include="views\鍏叡椤甸潰\Kf_SourceBillEditDlg_PDA.html" />
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\QC_CustomerAppealReport_BadClass.html" />
@@ -449,6 +459,12 @@
<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_PNLInfoEdit.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_BarCodeBill_PNL_TempEdit.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_PNLInfoList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_BarCodeBill_PNL_TempList.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_BarCodeBill_Set_TempEdit.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_BarCodeBill_Set_TempList.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_CusType_ExtendDoubleClickReturn.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_ManualSynchronization.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterialCorrection.html" />
@@ -616,6 +632,7 @@
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_MouldFile_Excel.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_MouldMaintainRuleBill_Excel.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_MouldMaintainRuleBillList_PDA.html" />
+ <Content Include="views\鐢熶骇绠＄悊\涓夊崌鎺掍骇\JIT_DayPlanPlatForm_Sec.html" />
<Content Include="views\鐢熶骇绠＄悊\涓夊崌鎺掍骇\JIT_DayPlanPlatForm.html" />
<Content Include="views\鐢熶骇绠＄悊\涓夊崌鎺掍骇\JIT_DayPlanPlatFormImport_SS_Sec.html" />
<Content Include="views\鐢熶骇绠＄悊\涓夊崌鎺掍骇\JIT_DayPlanPlatFormImport_SS.html" />
@@ -653,11 +670,9 @@
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掑熀纭�璧勬枡\JIT_NeedMaterPlanConfigBill_Excel.html" />
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掓姤琛╘JIT_DayPlanPlatFormHistoryNoteReport.html" />
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掓姤琛╘JIT_FuHeFenXiReportDetail.html" />
-<<<<<<< HEAD
+ <Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掓姤琛╘Sc_ArrangeRiskICMOBillReport.html" />
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掓姤琛╘ReportMOMaterReadysBillTotalList.html" />
-=======
<Content Include="views\鐢熶骇绠＄悊\娆犳枡杩愮畻\JIT_MaterialLevelShorAnalysisReport_His.html" />
->>>>>>> 0adef152d8494601c9665fd2d690774c662a02fd
<Content Include="views\鐢熶骇绠＄悊\娆犳枡杩愮畻\JIT_MaterialLevelShorAnalysis.html" />
<Content Include="views\鐢熶骇绠＄悊\娆犳枡杩愮畻\JIT_MaterialLevelShorAnalysisDetailReport.html" />
<Content Include="views\鐢熶骇绠＄悊\娆犳枡杩愮畻\JIT_MaterialLevelShorAnalysisReport.html" />
@@ -737,6 +752,8 @@
<Content Include="views\璁惧绠＄悊\璁惧瑙勭▼鍗昞Sb_EquipPatrolCheckRuleEdit.html" />
<Content Include="views\璁惧绠＄悊\璁惧瑙勭▼鍗昞Sb_EquipPatrolCheckRuleList.html" />
<Content Include="views\璁惧绠＄悊\璁惧瑙勭▼鍗昞Sb_EquipMaintainRuleBill_Excel.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\PNL妫�楠屼俊鎭痋QC_CheckNote_PNL_TempEdit.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\PNL妫�楠屼俊鎭痋QC_CheckNote_PNL_TempList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\鍩虹寤烘ā\Gy_ErrMsgBackType_Excel.html" />
<Content Include="views\璐ㄩ噺绠＄悊\鍩虹寤烘ā\Gy_ErrType_Excel.html" />
<Content Include="views\璐ㄩ噺绠＄悊\鍩虹寤烘ā\QC_SpcCenterlineList.html" />
@@ -749,6 +766,7 @@
<Content Include="views\璐ㄩ噺绠＄悊\鐜妫�娴嬪崟\QC_EnvironmentTestDotCheckBillEdit.html" />
<Content Include="views\璐ㄩ噺绠＄悊\鐜妫�娴嬪崟\QC_EnvironmentTestDotCheckBillList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\鐜妫�娴嬪崟\QC_EnvironmentTestDotCheckBillEdit_PDA.html" />
+ <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_FiveMenOneRingList_ICMO.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_QualityDailyReprot_Sum.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_QualityDailyReprot.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_FiveMenOneRingList.html" />
@@ -844,6 +862,7 @@
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Gy_WorkBeginDotCheckListBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Mes_OrderProcFlowAllReport_ICMO.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Qc_PreventErrMouldCheckReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_OEEReport_RunLogs.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_WorkBeginDotCheckReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_MouldRequirementDay.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_CompareOrderToSelloutReport.html" />
@@ -868,6 +887,7 @@
<Content Include="views\閲囪喘绠＄悊\搴斾粯鍗昞Cg_PayableBillQuery.html" />
<Content Include="views\閲囪喘绠＄悊\搴斾粯鍗昞Cg_PayableBillCheckQuery.html" />
<Content Include="views\閲囪喘绠＄悊\鏀舵枡閫氱煡鍗昞Cg_POInStockBillQuery.html" />
+ <Content Include="views\閲囪喘绠＄悊\鏀舵枡閫氱煡鍗昞Cg_POInStockBillList_JiaNan.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘鎶ヨ〃\Gy_SupplierPayPlanReport.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘鍚堝悓\Add_Edit_Cg_ContractBillList.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘鍚堝悓\Cg_ContractBillList.html" />
@@ -878,6 +898,7 @@
<Content Include="views\閲囪喘绠＄悊\閲囪喘鎶ヨ〃\Cg_POMaterialPriceReport.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘鎶ヨ〃\Cg_POOrderBillProcessSumReport.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘鎶ヨ〃\Cg_POOrderInStockSumReport.html" />
+ <Content Include="views\閲囪喘绠＄悊\閲囪喘鎶ヨ〃\Cg_PoOrderInStockSumReport_QX.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘鏍搁攢\Cg_POStockInBillList_Sec.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘璁㈠崟\Cg_POOrderBillCheckQuery.html" />
<Content Include="views\閲囪喘绠＄悊\閲囪喘璁㈠崟\Cg_POOrderBillQuery.html" />
@@ -897,6 +918,7 @@
<Content Include="views\閿�鍞鐞哱閿�鍞悎鍚孿Xs_ContractBillList.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞姤浠峰崟\Xs_SeQuotationBillMain.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞姤浠峰崟\Xs_SeQuotationBillMainList.html" />
+ <Content Include="views\閿�鍞鐞哱閿�鍞姤琛╘Xs_SeOrderOutStockSumReport_QX.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞姤琛╘Xs_SeOrderOutStockSumReport.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞牳閿�\XS_SellOutBillList_Sec.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞鍗昞Xs_SeOrderBillQuery.html" />
@@ -1425,6 +1447,10 @@
<Content Include="views\grf\15鐧芥爣鎵撳嵃.grf" />
<Content Include="views\grf\杩芥函鐮�.grf" />
<Content Include="views\grf\娉曞緥鏍囩.grf" />
+ <Content Include="views\grf\鐗╂枡鏉＄爜_杩﹀崡.grf" />
+ <Content Include="views\grf\鍖呮潯鐮乢杩﹀崡1.grf" />
+ <Content Include="views\grf\鎵樻潯鐮乢杩﹀崡1.grf" />
+ <Content Include="views\grf\绠辨潯鐮乢杩﹀崡1.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -2345,6 +2371,7 @@
<Content Include="views\椤圭洰绠＄悊\鍩虹寤烘ā\Gy_TaskClass.html" />
<Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskBill_AutoLoadBillMain.html" />
<Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskBill_AutoLoadBillMain_20241226.html" />
+ <Content Include="views\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_ProjectTaskFeesQuery.html" />
<Content Include="views\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_ProjectTaskNeedSaveQuery.html" />
<Content Include="views\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_ProjectTaskNeedCheckQuery.html" />
<Content Include="views\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_CustomerProInfoBillMainList.html" />
@@ -2367,6 +2394,7 @@
<Content Include="views\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_ProjectMoneyBillMain.html" />
<Content Include="views\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_ProjectBill.html" />
<Content Include="views\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_ProjectBillList.html" />
+ <Content Include="views\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_ProjectTaskStepsQuery.html" />
<Content Include="views\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_WorkPlanMonthBillMain.html" />
<Content Include="views\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_WorkPlanMonthBillMainList.html" />
<Content Include="views\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_CustomerTaskBillMain.html" />
--
Gitblit v1.9.1