Explorar el Código

Merge branch 'dev' of http://123.60.180.165:4647/ZZYDOP/DOPCore into dev

heteng hace 2 años
padre
commit
de6985224c

+ 37 - 0
MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -3099,6 +3099,43 @@ namespace Business.ResourceExamineManagement
                     {
                         return "工单信息为"+ morders[0].morder_state + ",不允许下达。";
                     }
+                    var itemMs= _itemMaster.Select(x => x.ItemNum == morders[0].product_code && x.Domain == domain).FirstOrDefault();
+                    if (itemMs == null)
+                    {
+                        return "当前物料未未维护主数据,请先维护物料主数据。";
+                    }
+                    else
+                    {
+                        string msg = "";
+                        if (!string.IsNullOrEmpty(itemMs.PORcptStatus))
+                        {
+                            switch (itemMs.PORcptStatus.ToUpper())
+                            {
+                                case "01":
+                                    msg = "因采购/仓库而被冻结。";
+                                    break;
+                                case "02":
+                                    msg = "因任务清单/BOM而被冻结。";
+                                    break;
+                                case "81":
+                                    msg = "MPN:BOM抬头冻结";
+                                    break;
+                                case "CO":
+                                    msg = "未跑成本-财务冻结";
+                                    break;
+                                case "RS":
+                                    msg = "瑞奇物料冻结";
+                                    break;
+                                default:
+                                    msg = "未知冻结,类型:" + itemMs.PORcptStatus;
+                                    break;
+                            }
+                        }
+                        if (!string.IsNullOrEmpty(msg))
+                        {
+                            return msg;
+                        }
+                    }
                     try
                     {
                         //如果生成领料单,需清理掉当前工单的占用,然后根据领料单的数据,来生成工单的占用

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

@@ -155,5 +155,10 @@ namespace Business.Domain
         /// 物料类型
         /// </summary>
         public string Drawing { get; set; }
+
+        /// <summary>
+        /// 物料状态
+        /// </summary>
+        public string PORcptStatus { get; set; }
     }
 }