Ver código fonte

生成工单时是否打标默认取物料主数据的默认打标设置

heteng 2 anos atrás
pai
commit
e62472cc7b

+ 4 - 0
MicroServices/Business/Business.Application/ReplenishmentManagement/ReplenishmentAppService.cs

@@ -3883,6 +3883,8 @@ namespace Business.Replenishment
             List<string> orderCode = morders.Select(c => c.product_code).ToList();
             //成品虚拟件对应关系
             var productOpList = _productStructureOp.Select(x => orderCode.Contains(x.ProductItem) && x.Domain == param.factoryId.ToString());
+            //获取物料主数据
+            List<ItemMaster> itemMasters = _itemMaster.Select(p => p.Domain == param.factoryId.ToString() && orderCode.Contains(p.ItemNum)).ToList();
             foreach (var item in morders)
             {
                 var moItem = exmResult.Find(b => b.morder_no ==item.morder_no);
@@ -3900,6 +3902,8 @@ namespace Business.Replenishment
                 workOrd.Status ="";
                 workOrd.IsActive = true;
                 workOrd.IsConfirm = true;
+                var curItem = itemMasters.FirstOrDefault(p => p.ItemNum == item.product_code);
+                workOrd.CreateGLforLaborVar = curItem == null ? false : curItem.Install;
                 workOrd.CreateTime = DateTime.Now;
                 workOrd.Typed = "";
                 //workOrd.SalesJob = item.morder_no;

+ 4 - 1
MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -4401,7 +4401,8 @@ namespace Business.ResourceExamineManagement
             List<string> orderCode = morders.Select(c => c.product_code).ToList();
             //成品虚拟件对应关系
             var productOpList = _productStructureOp.Select(x => orderCode.Contains(x.ProductItem) && x.Domain == param.factoryId.ToString());
-
+            //获取物料主数据
+            List<ItemMaster> itemMasters = _itemMaster.Select(p => p.Domain == param.factoryId.ToString() && orderCode.Contains(p.ItemNum)).ToList();
             foreach (var item in morders)
             {
                 //添加工单数据
@@ -4418,6 +4419,8 @@ namespace Business.ResourceExamineManagement
                 workOrd.Status = "p";
                 workOrd.IsActive = true;
                 workOrd.IsConfirm = true;
+                var curItem = itemMasters.FirstOrDefault(p => p.ItemNum == item.product_code);
+                workOrd.CreateGLforLaborVar = curItem == null ? false : curItem.Install;
                 workOrd.CreateTime = DateTime.Now;
                 workOrd.Typed = "";
                 var me = WriteMoentry.Find(s => s.moentry_moid == item.Id);

+ 6 - 0
MicroServices/Business/Business.Domain/StructuredDB/MES/IC/ItemMaster.cs

@@ -87,6 +87,12 @@ namespace Business.Domain
         [Comment("是否有效")]
         public bool IsActive { get; set; }
 
+        /// <summary>
+        /// 是否打标:1-打标;0-不达标
+        /// </summary>
+        [Comment("是否打标")]
+        public bool Install { get; set; }
+
         /// <summary>
         /// 是否有效:1-有效;0-无效
         /// </summary>

+ 6 - 0
MicroServices/Business/Business.Domain/StructuredDB/Production/WorkOrdMaster.cs

@@ -173,5 +173,11 @@ namespace Business.Domain
         [Comment("模拟计算版本号,不为空为年度长周期,为空为周计划")]
         [StringLength(80)]
         public string AnalogCalcVersion { get; set; }
+
+        /// <summary>
+        /// 是否打标:1-打标;0-不达标
+        /// </summary>
+        [Comment("是否打标")]
+        public bool CreateGLforLaborVar { get; set; }
     }
 }