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

MicroServices/Business/Business.Application/SystemJobManagement/SystemJobAppService.cs

@@ -621,20 +621,45 @@ namespace Business.SystemJobManagement
                 for (int i = 0; i < custList.Count; i++)
                 {
                     var ic_item = ic_itemList.Find(x => x.number == custList[i].ItemNum);
+                    int erpcls = 0;
+                    string erpclsText = "配置类";
+                    long itemId = help.NextId();
+                    if (custList[i].PurMfg == "P")
+                    {
+                        if (custList[i].EMTType == "50")
+                        {
+                            erpcls = 4;
+                            erpclsText = "虚拟";
+                        }
+                        else
+                        {
+                            erpcls = 3;
+                            erpclsText = "外购";
+                        }
+                    }
+                    else
+                    {
+                        if (custList[i].EMTType == "30")
+                        {
+                            erpcls = 2;
+                            erpclsText = "委外";
+                        }
+                        else
+                        {
+                            erpcls = 1;
+                            erpclsText = "自制";
+                        }
+                    }
                     if (ic_item == null)
                     {
-                        long itemId = help.NextId();
                         ItemsAdd.Add(new ic_item(itemId)
                         {
                             number = custList[i].ItemNum, //物料编码
                             name = custList[i].Descr, //物料名称
                             model = custList[i].Descr1,//规格型号
                             fversion = custList[i].Rev,//版本号
-                            //ext.FErpClsID == "配置类" ? 0 : ext.FErpClsID == "自制" ? 1 : ext.FErpClsID == "委外" ? 2 : ext.FErpClsID == "外购" ? 3 : ext.FErpClsID == "虚拟" ? 4 : ext.FErpClsID == "费用" ? 5 : ext.FErpClsID == "服务" ? 6 : -1;
-                            //erp_cls = custList[i].PurMfg == "P" ? 3 : 1,//物料属性
-                            erp_cls = custList[i].PurMfg == "P" ? 3 : 1,//物料属性
-                            //erp_cls_name = custList[i].PurMfg == "P" ? "外购" : "自制",//物料属性名称
-                            erp_cls_name = custList[i].PurMfg == "P" ? "外购" : "自制",//物料属性名称
+                            erp_cls = erpcls,//物料属性
+                            erp_cls_name = erpclsText,//物料属性名称
                             unit = custList[i].UM,//单位
                             item_level = 0,//物料等级
                             source = "",//来源
@@ -727,8 +752,8 @@ namespace Business.SystemJobManagement
                         ic_item.name = custList[i].Descr;
                         ic_item.model = custList[i].Descr1;//规格型号
                         ic_item.fversion = custList[i].Rev;//版本号
-                        ic_item.erp_cls = custList[i].PurMfg == "P" ? 3 : 1;//物料属性
-                        ic_item.erp_cls_name = custList[i].PurMfg == "P" ? "外购" : "自制";//物料属性名称
+                        ic_item.erp_cls = erpcls;//物料属性
+                        ic_item.erp_cls_name = erpclsText;//物料属性名称
                         ic_item.unit = custList[i].UM;//单位
                         ic_item.clean_leadtime = custList[i].MFGMTTR;
                         ic_item.PurLT = custList[i].PurLT;

MicroServices/Business/Business.Domain/StructuredDB/MES/IC/ItemMaster.cs

@@ -121,5 +121,10 @@ namespace Business.Domain
         /// </summary>
         [Comment("检验天数")]
         public int InsLT { get; set; }
+
+        /// <summary>
+        /// 特殊采购类型
+        /// </summary>
+        public string EMTType { get; set; }
     }
 }