From a04b8ac0a35691b4c86ec4c795ef3b80b362aace Mon Sep 17 00:00:00 2001
From: leo <10200039@qq.com>
Date: Mon, 22 May 2023 13:13:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=85=A5=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FactorySystemBll/MaterialTeamworkBll.cs | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/FactorySystemBll/MaterialTeamworkBll.cs b/FactorySystemBll/MaterialTeamworkBll.cs
index 742b0bc..ae5506a 100644
--- a/FactorySystemBll/MaterialTeamworkBll.cs
+++ b/FactorySystemBll/MaterialTeamworkBll.cs
@@ -562,6 +562,13 @@ namespace FactorySystemBll
                     isnull(FMRP1CustomerCode, '') AS 'MRP1.客户代码',
                     isnull(FMRP1SizeMaterial, '') AS 'MRP1.大小料',
                     isnull(FMRP1SmallMaterialStandard, '') AS 'MRP1. 小料标准(小于)',
+                    isnull(FMRP1ReorderLocation, '') AS 'MRP1.再订货点',
+                    isnull(FMRP1RegularBatchSize, '') AS 'MRP1.固定批量大小',
+                    isnull(FMRP1MaxInventorySize, '') AS 'MRP1.最大库存水平',
+                    isnull(FMRP1IgnoreLack, '') AS 'MRP1.不计算缺料',
+                    isnull(FMRP1laminated, '') AS 'MRP1.压膜',
+                    isnull(FMRP1SafeStock, '') AS 'MRP1.安全库存带小样',
+                    isnull(FMRP1RequireCount, '') AS 'MRP1.需求计算不考虑前置物料库存',
                     isnull(FMRP2PurchaseType, '') AS 'MRP2.采购类型',
                     isnull(FMRP2PlanMarginalCode, '') AS 'MRP2.计划边际码',
                     isnull(FMRP2SpecialProcurement, '') AS 'MRP2.特殊采购类',
@@ -579,6 +586,9 @@ namespace FactorySystemBll
                     isnull(FMRP3BlendMRP, '') AS 'MRP3.混合MRP',
                     isnull(FMRP3AvailabilityCheck, '') AS 'MRP3.可用性检查',
                     isnull(FMRP4AloneOrFocus, '') AS 'MRP4.单独或集中',
+                    isnull(FMRP4DiscontinuousIidentifier, '') AS 'MRP4.非连续标识',
+                    isnull(FMRP4EffectivePeriod, '') AS 'MRP4.生效期',
+                    isnull(FMRP4FollowMaterial, '') AS 'MRP4.后续的物料',
                     isnull(FPlanProductPlanParam, '') AS '工作计划视图.生产计划参数文件',
                     isnull(FPlanUnlimitedOverDelivery, '') AS '工作计划视图.无限制过量交货',
                     isnull(FPlanUnderDeliveryTolerance, '') AS '工作计划视图.不足交货允差',
@@ -599,18 +609,7 @@ namespace FactorySystemBll
                     isnull(FAccountSaleOrderInventory, '') AS '会计视图.VC: 销售订单库存',
                     isnull(FAccountStandardPrice, '') AS '会计视图.标准价格',
                     isnull(FAccountProfitCenter, '') AS '会计视图.利润中心',
-                    isnull(FAccountCostAccountBatch, '') AS '会计视图.成本核算批量',
-                    isnull(FExtraQuantity, '') AS '额外增加字段：配方视图、组装bom视图的基本数量对应PLM配方下载BOM中用量',
-                    isnull(FMRP1ReorderLocation, '') AS 'MRP1.再订货点',
-                    isnull(FMRP1RegularBatchSize, '') AS 'MRP1.固定批量大小',
-                    isnull(FMRP1MaxInventorySize, '') AS 'MRP1.最大库存水平',
-                    isnull(FMRP1IgnoreLack, '') AS 'MRP1.不计算缺料',
-                    isnull(FMRP1laminated, '') AS 'MRP1.压膜',
-                    isnull(FMRP1SafeStock, '') AS 'MRP1.安全库存带小样',
-                    isnull(FMRP1RequireCount, '') AS 'MRP1.需求计算不考虑前置物料库存',
-                    isnull(FMRP4DiscontinuousIidentifier, '') AS 'MRP4.非连续标识',
-                    isnull(FMRP4EffectivePeriod, '') AS 'MRP4.生效期',
-                    isnull(FMRP4FollowMaterial, '') AS 'MRP4.后续的物料'
+                    isnull(FAccountCostAccountBatch, '') AS '会计视图.成本核算批量'
                 FROM TFS_ViewMaterial";
                 
             if ("2".Equals(teamworkType))