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

MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -2027,25 +2027,28 @@ namespace Business.ResourceExamineManagement
                     {
                         clist.ForEach(c =>
                         {
-                            srm_po_occupy srm_Po_Occupy = new srm_po_occupy();
-                            srm_Po_Occupy.GenerateNewId(help.NextId());
-                            //srm_Po_Occupy.bang_id = bangid;
-                            srm_Po_Occupy.morder_mo = c.pr_mono;
-                            srm_Po_Occupy.qty = c.pr_aqty;
-                            srm_Po_Occupy.eid = c.sentry_id;
-                            srm_Po_Occupy.polist_id = p.Id;
-                            srm_Po_Occupy.polist_row = p.polist_row;
-                            srm_Po_Occupy.type = MorderEnum.Zyjc_Type;//TODO:类型未知
-                            srm_Po_Occupy.stime = p.create_time;
-                            srm_Po_Occupy.etime = p.rarrdate;
-                            srm_Po_Occupy.state = 1;
-                            srm_Po_Occupy.tenant_id = param.tenantId;//取销售子表企业ID
-                            srm_Po_Occupy.factory_id = param.factoryId;
-                            srm_Po_Occupy.create_time = DateTime.Now;
-                            srm_Po_Occupy.create_by_name = "admin";
-                            srm_Po_Occupy.update_time = DateTime.Now;
-                            srm_Po_Occupy.update_by_name = "admin";
-                            poaction.poOccupiesList.Add(srm_Po_Occupy);
+                            if (!string.IsNullOrEmpty(c.pr_mono))
+                            {
+                                srm_po_occupy srm_Po_Occupy = new srm_po_occupy();
+                                srm_Po_Occupy.GenerateNewId(help.NextId());
+                                //srm_Po_Occupy.bang_id = bangid;
+                                srm_Po_Occupy.morder_mo = c.pr_mono;
+                                srm_Po_Occupy.qty = c.pr_aqty;
+                                srm_Po_Occupy.eid = c.sentry_id;
+                                srm_Po_Occupy.polist_id = p.Id;
+                                srm_Po_Occupy.polist_row = p.polist_row;
+                                srm_Po_Occupy.type = MorderEnum.Zyjc_Type;//TODO:类型未知
+                                srm_Po_Occupy.stime = p.create_time;
+                                srm_Po_Occupy.etime = p.rarrdate;
+                                srm_Po_Occupy.state = 1;
+                                srm_Po_Occupy.tenant_id = param.tenantId;//取销售子表企业ID
+                                srm_Po_Occupy.factory_id = param.factoryId;
+                                srm_Po_Occupy.create_time = DateTime.Now;
+                                srm_Po_Occupy.create_by_name = "admin";
+                                srm_Po_Occupy.update_time = DateTime.Now;
+                                srm_Po_Occupy.update_by_name = "admin";
+                                poaction.poOccupiesList.Add(srm_Po_Occupy);
+                            }
                         });
                     }
                     

MicroServices/Business/Bussiness.Model/Base/BaseEntity.cs

@@ -81,7 +81,7 @@ namespace Business.Model
         /// </summary>
         [Required]
         [Comment("公司ID")]
-        public virtual long entity_id { get; set; }
+        public virtual long company_id { get; set; }
 
         /// <summary>
         /// 工厂ID