Merge branch 'master' of http://123.60.180.165:4647/ZZYDOP/DOPCore

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

@@ -397,13 +397,13 @@ namespace Business.ResourceExamineManagement
             long bangid = snow.NextId();
 
             //获取订单数据
-            crm_seorder sorder = _mysql_crm_seorder.GetListAsync(p => p.Id == input.sorderId && p.IsDeleted == false).Result.FirstOrDefault();
+            crm_seorder sorder = _mysql_crm_seorder.GetListAsync(p=>p.tenant_id == input.tenantId && p.factory_id == input.factoryId && p.Id == input.sorderId && p.IsDeleted ==false).Result.FirstOrDefault();
             if (sorder == null)
             {
                 throw new NotImplementedException("订单数据不存在！");
             }
             //获取订单行数据
-            List<crm_seorderentry> sentrys = _mysql_crm_seorderentry.GetListAsync(p => p.seorder_id == input.sorderId && p.IsDeleted == false).Result;
+            List<crm_seorderentry> sentrys = _mysql_crm_seorderentry.GetListAsync(p => p.tenant_id == input.tenantId && p.factory_id == input.factoryId && p.seorder_id == input.sorderId && p.IsDeleted == false).Result;
 
             string bom_number = "BOM00042070";
             int packages = 1000;
@@ -653,12 +653,12 @@ namespace Business.ResourceExamineManagement
             //1.3、获取当前工艺路径下的工序数据
             //FilterDefinition<mes_process> filter = Builders<mes_process>.Filter.In(s => s.Id, tech_Processes.Select(m => m.proc_id).ToList());
             //List<mes_process> process = await _mes_process.GetManyByIds(filter);
-            List<long> procIds = tech_Processes.Select(m => m.proc_id).ToList();
+            List<long> procIds = tech_Processes.Select(m => m.proc_id.Value).ToList();
             List<mes_process> process = await _mes_process.GetManyByCondition(p => procIds.Contains(p.Id) && p.IsDeleted == false);
 
             //1.3、获取工艺工序关联工位信息
             List<long> techProcIds = tech_Processes.Select(m => m.Id).ToList();
-            List<mes_tech_proc_workshop> tech_Proc_Workshops = await _mes_tech_proc_workshop.GetManyByCondition(p => techProcIds.Contains(p.tech_proc_id) && p.IsDeleted == false);
+            List<mes_tech_proc_workshop> tech_Proc_Workshops = await _mes_tech_proc_workshop.GetManyByCondition(p => techProcIds.Contains(p.tech_proc_id.Value) && p.IsDeleted == false);
             #endregion
 
             #region 计算产能，得到耗时
@@ -695,7 +695,7 @@ namespace Business.ResourceExamineManagement
                 sumTimes += curTakeTime;
                 //添加耗时记录
                 dto.tech_id = tech.Id;
-                dto.proc_id = chd.proc_id;
+                dto.proc_id = chd.proc_id.Value;
                 dto.nextproc_id = chd.nextprocid;
                 dto.wait_time = curTakeTime;
                 starts.Add(dto);
@@ -1933,7 +1933,7 @@ namespace Business.ResourceExamineManagement
         private async Task<List<ICItemDateDto>> CheckOnOrder(List<BomChildExamineDto> returnlist, long tenantId, long factoryid, DateTime deliveryDate, long bangid)
         {
             //ToDo:企业Id,数据状态过滤以及isdeleted
-            var po_list = _srm_po_list.Find(p => returnlist.Select(x => x.item_id).Contains(p.icitem_id) && p.tenant_id == tenantId && p.factory_id == factoryid && p.rarrdate >= DateTime.Now && p.rarrdate < deliveryDate && !p.IsDeleted).Result;
+            var po_list = _srm_po_list.Find(p => returnlist.Select(x => x.item_id).Contains(p.icitem_id.Value) && p.tenant_id == tenantId && p.factory_id == factoryid && p.rarrdate >= DateTime.Now && p.rarrdate < deliveryDate && !p.IsDeleted).Result;
             var itemlist = new List<ICItemDateDto>();//需要生成采购申请单的物料信息
             var leadTimeList = GetLeadTime(returnlist, tenantId, factoryid);//提前期列表
             var supplierList = GetSupplier(returnlist, tenantId, factoryid);//供应商列表
@@ -1968,7 +1968,7 @@ namespace Business.ResourceExamineManagement
                             if (itemPOQty + itemPO[i].qty - itemPO[i].esqty >= item.lack_qty)
                             {
                                 //在途满足，写占用表
-                                itemlist.Add(new ICItemDateDto { item_id = itemPO[i].icitem_id, dateTime = itemPO[i].rarrdate });
+                                itemlist.Add(new ICItemDateDto { item_id = itemPO[i].icitem_id.Value, dateTime = itemPO[i].rarrdate });
                                 srm_po_occupy po_Occupy = new srm_po_occupy();
                                 po_Occupy.GenerateNewId();
                                 po_Occupy.polist_id = itemPO[i].po_id;//采购订单id

MicroServices/Business/Bussiness.Model/Production/mes_moentry.cs

@@ -27,35 +27,35 @@ namespace Bussiness.Model.Production
         /// 工单主表id
         /// </summary>
         [Description("工单主表id")]
-        public long moentry_moid { get; set; }
+        public long? moentry_moid { get; set; }
         /// <summary>
         /// 工单编号
         /// </summary>
         [StringLength(80)]
         [Description("工单编号")]
-        public string moentry_mono { get; set; }
+        public string? moentry_mono { get; set; }
         /// <summary>
         /// 订单行id
         /// </summary>
         [Description("订单行id")]
-        public long soentry_id { get; set; }
+        public long? soentry_id { get; set; }
         /// <summary>
         /// 订单行号
         /// </summary>
         [Description("订单行号")]
-        public long fentry_id { get; set; }
+        public long? fentry_id { get; set; }
         /// <summary>
         /// 订单编号
         /// </summary>
         [StringLength(80)]
         [Description("订单编号")]
-        public string fbill_no { get; set; }
+        public string? fbill_no { get; set; }
         /// <summary>
         /// 单位
         /// </summary>
         [StringLength(80)]
         [Description("单位")]
-        public string unit { get; set; }
+        public string? unit { get; set; }
         /// <summary>
         /// 工单生产数量(计划数量)
         /// </summary>

MicroServices/Business/Bussiness.Model/Production/mes_mooccupy.cs

@@ -29,26 +29,26 @@ namespace Bussiness.Model.Production
         /// </summary>
         [StringLength(50)]
         [Description("类型--原始,分配")]
-        public string moo_id_type { get; set; }
+        public string? moo_id_type { get; set; }
 
         /// <summary>
         /// 订单id
         /// </summary>
         [Description("订单id")]
-        public long moo_id_billid { get; set; }
+        public long? moo_id_billid { get; set; }
 
         /// <summary>
         /// 订单号
         /// </summary>
         [StringLength(50)]
         [Description("订单号")]
-        public string fbill_no { get; set; }
+        public string? fbill_no { get; set; }
 
         /// <summary>
         /// 行号
         /// </summary>
         [Description("行号")]
-        public long fentry_id { get; set; }
+        public long? fentry_id { get; set; }
 
         /// <summary>
         /// 物料编码
@@ -56,7 +56,7 @@ namespace Bussiness.Model.Production
         [Required]
         [StringLength(50)]
         [Description("物料编码")]
-        public string fitem_number { get; set; }
+        public string? fitem_number { get; set; }
 
         /// <summary>
         /// 物料名称
@@ -64,27 +64,27 @@ namespace Bussiness.Model.Production
         [Required]
         [StringLength(500)]
         [Description("物料名称")]
-        public string fitem_name { get; set; }
+        public string? fitem_name { get; set; }
 
         /// <summary>
         /// 规格型号
         /// </summary>
         [StringLength(500)]
         [Description("规格型号")]
-        public string fmodel { get; set; }
+        public string? fmodel { get; set; }
 
         /// <summary>
         /// 工单id
         /// </summary>
         [Description("工单id")]
-        public long moo_moid { get; set; }
+        public long? moo_moid { get; set; }
 
         /// <summary>
         /// 工单号
         /// </summary>
         [StringLength(50)]
         [Description("工单号")]
-        public string moo_mo { get; set; }
+        public string? moo_mo { get; set; }
 
         /// <summary>
         /// 占用量
@@ -110,7 +110,7 @@ namespace Bussiness.Model.Production
         /// </summary>
         [DefaultValue(0)]
         [Description("占用状态-1占用  默认0")]
-        public int moo_state { get; set; }
+        public int? moo_state { get; set; }
 
         /// <summary>
         /// 变更人

MicroServices/Business/Bussiness.Model/Production/mes_morder.cs

@@ -46,7 +46,7 @@ namespace Bussiness.Model.Production
         [Required]
         [StringLength(50)]
         [Description("生产工单编号")]
-        public string morder_no { get; set; }
+        public string? morder_no { get; set; }
         /// <summary>
         /// 生产工单类型(类型：计划工单、销售工单、委外工单、预测工单)
         /// </summary>

MicroServices/Business/Bussiness.Model/Production/mes_morder_loss_time.cs

@@ -34,7 +34,7 @@ namespace Bussiness.Model.Production
         [Required]
         [StringLength(50)]
         [Description("生产工单编号")]
-        public string morder_no { get; set; }
+        public string? morder_no { get; set; }
         /// <summary>
         /// 生产工单行号
         /// </summary>
@@ -62,7 +62,7 @@ namespace Bussiness.Model.Production
         [Required]
         [StringLength(255)]
         [Description("记录人名称")]
-        public string recorder_name { get; set; }
+        public string? recorder_name { get; set; }
         /// <summary>
         /// 人员数量
         /// </summary>
@@ -92,7 +92,7 @@ namespace Bussiness.Model.Production
         [Required]
         [StringLength(50)]
         [Description("工作中心名称")]
-        public string workc_name { get; set; }
+        public string? workc_name { get; set; }
         /// <summary>
         /// 责任单位id
         /// </summary>
@@ -104,14 +104,14 @@ namespace Bussiness.Model.Production
         [Required]
         [StringLength(50)]
         [Description("责任单位名称")]
-        public string dept_name { get; set; }
+        public string? dept_name { get; set; }
         /// <summary>
         /// 损失时间原因
         /// </summary>
         [Required]
         [StringLength(255)]
         [Description("损失时间原因")]
-        public string reason { get; set; }
+        public string? reason { get; set; }
         /// <summary>
         /// 描述
         /// </summary>

MicroServices/Business/Bussiness.Model/Production/mes_schedule_occupy.cs

@@ -44,27 +44,27 @@ namespace Bussiness.Model.Production
         /// </summary>
         [DefaultValue(0)]
         [Description("状态 0-待使用，1-已使用")]
-        public int status { get; set; }
+        public int? status { get; set; }
         /// <summary>
         /// 是否锁定 0-正常，1-锁定
         /// </summary>
         [DefaultValue(0)]
         [Description("是否锁定 0-正常，1-锁定")]
-        public int is_Locked { get; set; }
+        public int? is_Locked { get; set; }
         /// <summary>
         /// 生产组织id
         /// </summary>
         [Description("生产组织id")]
-        public long prd_org_id { get; set; }
+        public long? prd_org_id { get; set; }
         /// <summary>
         /// 工作中心id:工位id
         /// </summary>
         [Description("工作中心id")]
-        public long work_center_id { get; set; }
+        public long? work_center_id { get; set; }
         /// <summary>
         /// 工作日历id
         /// </summary>
         [Description("工作日历id")]
-        public long work_calendar_id { get; set; }
+        public long? work_calendar_id { get; set; }
     }
 }

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_loss_time_record.cs

@@ -30,7 +30,7 @@ namespace Bussiness.Model.ProductionProcess
         [StringLength(50)]
         [Description("工单编号")]
 
-        public string morder_no { get; set; }
+        public string? morder_no { get; set; }
         /// <summary>
         /// 损失开始时间
         /// </summary>
@@ -69,7 +69,7 @@ namespace Bussiness.Model.ProductionProcess
         /// 记录人工号
         /// </summary>
         [Description("记录人工号")]
-        public string record_no { get; set; }
+        public string? record_no { get; set; }
         /// <summary>
         /// 是否停线
         /// </summary>

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_meaction.cs

@@ -28,7 +28,7 @@ namespace Bussiness.Model.ProductionProcess
         [Required]
         [StringLength(50)]
         [Description("生产工单号")]
-        public string morder_no { get; set; }
+        public string? morder_no { get; set; }
         /// <summary>
         /// 操作时间
         /// </summary>

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_mebycard.cs

@@ -28,7 +28,7 @@ namespace Bussiness.Model.ProductionProcess
         [Required]
         [StringLength(50)]
         [Description("生产工单号")]
-        public string mebycard_mono { get; set; }
+        public string? mebycard_mono { get; set; }
         /// <summary>
         /// 工序id
         /// </summary>
@@ -40,21 +40,21 @@ namespace Bussiness.Model.ProductionProcess
         [Required]
         [StringLength(100)]
         [Description("工序编码")]
-        public string mebycard_pno { get; set; }
+        public string? mebycard_pno { get; set; }
         /// <summary>
         /// 工序名称
         /// </summary>   
         [Required]
         [StringLength(100)]
         [Description("工序名称")]
-        public string mebycard_pname { get; set; }
+        public string? mebycard_pname { get; set; }
         /// <summary>
         /// 刷卡人员卡号
         /// </summary>      
         [Required]
         [StringLength(100)]
         [Description("刷卡人员卡号")]
-        public string mebycard_byno { get; set; }
+        public string? mebycard_byno { get; set; }
         /// <summary>
         /// 刷卡时间
         /// </summary>   

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_merecheck.cs

@@ -29,7 +29,7 @@ namespace Bussiness.Model.ProductionProcess
         [Required]
         [StringLength(50)]
         [Description("生产工单号")]
-        public string morder_no { get; set; }
+        public string? morder_no { get; set; }
         /// <summary>
         /// 报检数量
         /// </summary>

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_stock_enter.cs

@@ -67,6 +67,6 @@ namespace Bussiness.Model.ProductionProcess
         /// </summary>
         [StringLength(80)]
         [Description("入库人姓名")]
-        public string ebyname { get; set; }
+        public string? ebyname { get; set; }
     }
 }

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_stock_out.cs

@@ -23,7 +23,7 @@ namespace Bussiness.Model.ProductionProcess
         /// </summary>
         [StringLength(80)]
         [Description("出库单号")]
-        public string out_no { get; set; }
+        public string? out_no { get; set; }
         /// <summary>
         /// 仓库名称
         /// </summary>
@@ -47,7 +47,7 @@ namespace Bussiness.Model.ProductionProcess
         /// </summary>
         [StringLength(255)]
         [Description("物料名称")]
-        public string fitem_name { get; set; }
+        public string? fitem_name { get; set; }
         /// <summary>
         /// 全名
         /// </summary>
@@ -65,7 +65,7 @@ namespace Bussiness.Model.ProductionProcess
         /// </summary>
         [StringLength(80)]
         [Description("销售订单号")]
-        public string order_no { get; set; }
+        public string? order_no { get; set; }
         /// <summary>
         /// 订单行号
         /// </summary>
@@ -97,12 +97,12 @@ namespace Bussiness.Model.ProductionProcess
         /// 出库人id
         /// </summary>
         [Description("出库人id")]
-        public long eby { get; set; }
+        public long? eby { get; set; }
         /// <summary>
         /// 出库人姓名
         /// </summary>
         [StringLength(80)]
         [Description("出库人姓名")]
-        public string eby_name { get; set; }
+        public string? eby_name { get; set; }
     }
 }

MicroServices/Business/Bussiness.Model/ProductionProcess/mes_swipe_card.cs

@@ -24,7 +24,7 @@ namespace Bussiness.Model.ProductionProcess
         [StringLength(255)]
         [Description("生产车间")]
 
-        public string product_org { get; set; }
+        public string? product_org { get; set; }
         /// <summary>
         /// 生产产线
         /// </summary>
@@ -32,7 +32,7 @@ namespace Bussiness.Model.ProductionProcess
         [StringLength(255)]
         [Description("生产产线")]
 
-        public string product_line { get; set; }
+        public string? product_line { get; set; }
         /// <summary>
         /// 卡号
         /// </summary>
@@ -40,7 +40,7 @@ namespace Bussiness.Model.ProductionProcess
         [StringLength(80)]
         [Description("卡号")]
 
-        public string card_no { get; set; }
+        public string? card_no { get; set; }
         /// <summary>
         /// 工单编号
         /// </summary>

MicroServices/Business/Bussiness.Model/SRM/srm_po_list.cs

@@ -18,7 +18,7 @@ namespace Bussiness.Model.SRM
         /// </summary>
         [Required]
         [Description("po单id")]
-        public long po_id { get; set; }
+        public long? po_id { get; set; }
         /// <summary>
         /// po单号
         /// </summary>
@@ -29,13 +29,13 @@ namespace Bussiness.Model.SRM
         /// 行号
         /// </summary>
         [Description("行号")]
-        public int polist_row { get; set; }
+        public int? polist_row { get; set; }
         /// <summary>
         /// pr申请单id
         /// </summary>
         [Required]
         [Description("pr申请单id")]
-        public long pr_id { get; set; }
+        public long? pr_id { get; set; }
         /// <summary>
         /// pr申请单号
         /// </summary>
@@ -53,7 +53,7 @@ namespace Bussiness.Model.SRM
         /// </summary>
         [Required]
         [Description("供应商id")]
-        public long pr_purchase_id { get; set; }
+        public long? pr_purchase_id { get; set; }
         /// <summary>
         /// 供应商名称
         /// </summary>
@@ -65,7 +65,7 @@ namespace Bussiness.Model.SRM
         /// </summary>
         [Required]
         [Description("收货仓库id")]
-        public long stock_id { get; set; }
+        public long? stock_id { get; set; }
         /// <summary>
         /// 收货仓库名称
         /// </summary>
@@ -77,7 +77,7 @@ namespace Bussiness.Model.SRM
         /// </summary>
         [Required]
         [Description("物料id")]
-        public long icitem_id { get; set; }
+        public long? icitem_id { get; set; }
         /// <summary>
         /// 物料名称
         /// </summary>
@@ -125,12 +125,12 @@ namespace Bussiness.Model.SRM
         /// </summary>
         [Required]
         [Description("单位")]
-        public long unit { get; set; }
+        public long? unit { get; set; }
         /// <summary>
         /// 数据状态标识 0停用 1启用
         /// </summary>
         [Description("数据状态标识")]
-        public int state { get; set; }
+        public int? state { get; set; }
         /// <summary>
         /// 需求到货日期
         /// </summary>
@@ -140,7 +140,7 @@ namespace Bussiness.Model.SRM
         /// 评审状态(0-待评审、1-评审通过、2-评审未通过)
         /// </summary>
         [Description("评审状态")]
-        public int rstate { get; set; }
+        public int? rstate { get; set; }
         /// <summary>
         /// 评审次数
         /// </summary>
@@ -187,7 +187,7 @@ namespace Bussiness.Model.SRM
         /// </summary>
         [Required]
         [Description("币别")]
-        public long currencytype { get; set; }
+        public long? currencytype { get; set; }
 
         /// <summary>
         /// 计算ID

MicroServices/Business/Bussiness.Model/SRM/srm_po_main.cs

@@ -36,7 +36,7 @@ namespace Bussiness.Model.SRM
         /// </summary>
         [Required]
         [Description("供应商id")]
-        public long po_purchase_id { get; set; }
+        public long? po_purchase_id { get; set; }
         /// <summary>
         /// 供应商名称
         /// </summary>
@@ -59,7 +59,7 @@ namespace Bussiness.Model.SRM
         /// </summary>
         [Required]
         [Description("交货方式")]
-        public long po_delivery { get; set; }
+        public long? po_delivery { get; set; }
         /// <summary>
         /// 税率
         /// </summary>
@@ -70,12 +70,12 @@ namespace Bussiness.Model.SRM
         /// 是否加急
         /// </summary>
         [Description("是否加急")]
-        public int po_express { get; set; }
+        public int? po_express { get; set; }
         /// <summary>
         /// 数据状态(0-新增、1-通过、2-完成、3-关闭、4-未通过)
         /// </summary>
         [Description("数据状态")]
-        public int state { get; set; }
+        public int? state { get; set; }
         /// <summary>
         /// 备注
         /// </summary>
@@ -86,7 +86,7 @@ namespace Bussiness.Model.SRM
         /// 评审状态
         /// </summary>
         [Description("评审状态")]
-        public int rstate { get; set; }
+        public int? rstate { get; set; }
         /// <summary>
         /// 评审次数
         /// </summary>
@@ -102,18 +102,18 @@ namespace Bussiness.Model.SRM
         /// 单据类型
         /// </summary>
         [Description("单据类型")]
-        public int po_order_type { get; set; }
+        public int? po_order_type { get; set; }
         /// <summary>
         /// 币别
         /// </summary>
         [Required]
         [Description("币别")]
-        public long currency { get; set; }
+        public long? currency { get; set; }
         /// <summary>
         /// 金蝶单据类型值（标准采购订单、标准委外订单）
         /// </summary>
         [Description("金蝶单据类型值")]
-        public int bill_type { get; set; }
+        public int? bill_type { get; set; }
 
         /// <summary>
         /// 计算ID

MicroServices/Business/Bussiness.Model/SRM/srm_po_occupy.cs

@@ -18,24 +18,24 @@ namespace Bussiness.Model.SRM
         /// </summary>
         [Required]
         [Description("采购订单id")]
-        public long polist_id { get; set; }
+        public long? polist_id { get; set; }
         /// <summary>
         /// 采购订单行号
         /// </summary>
         [Description("采购订单行号")]
-        public int polist_row { get; set; }
+        public int? polist_row { get; set; }
         /// <summary>
         /// 客户订单行id
         /// </summary>
         [Required]
         [Description("客户订单行id")]
-        public long eid { get; set; }
+        public long? eid { get; set; }
         /// <summary>
         /// 客户订单id
         /// </summary>
         [Required]
         [Description("客户订单id")]
-        public long bill_no { get; set; }
+        public long? bill_no { get; set; }
         /// <summary>
         /// 类型
         /// </summary>
@@ -67,7 +67,7 @@ namespace Bussiness.Model.SRM
         /// 占用状态
         /// </summary>
         [Description("占用状态")]
-        public int state { get; set; }
+        public int? state { get; set; }
         /// <summary>
         /// 变更人
         /// </summary>

MicroServices/Business/Bussiness.Model/SRM/srm_pr_main.cs

@@ -35,7 +35,7 @@ namespace Bussiness.Model.SRM
         /// </summary>
         [Required]
         [Description("供应商id")]
-        public long pr_purchaseid { get; set; }
+        public long? pr_purchaseid { get; set; }
         /// <summary>
         /// 供应商编码
         /// </summary>
@@ -83,7 +83,7 @@ namespace Bussiness.Model.SRM
         /// </summary>
         [Required]
         [Description("物料id")]
-        public long icitem_id { get; set; }
+        public long? icitem_id { get; set; }
         /// <summary>
         /// 物料名称
         /// </summary>
@@ -94,7 +94,7 @@ namespace Bussiness.Model.SRM
         /// 单据类型
         /// </summary>
         [Description("单据类型")]
-        public int pr_order_type { get; set; }
+        public int? pr_order_type { get; set; }
         /// <summary>
         /// 系统建议下单日期
         /// </summary>
@@ -174,7 +174,7 @@ namespace Bussiness.Model.SRM
         /// 状态
         /// </summary>
         [Description("状态")]
-        public int state { get; set; }
+        public int? state { get; set; }
         /// <summary>
         /// 已申请数量
         /// </summary>
@@ -185,7 +185,7 @@ namespace Bussiness.Model.SRM
         /// 申请类型
         /// </summary>
         [Description("申请类型")]
-        public int pr_type { get; set; }
+        public int? pr_type { get; set; }
         /// <summary>
         /// 币种
         /// </summary>

MicroServices/Business/Bussiness.Model/SRM/srm_purchase.cs

@@ -29,7 +29,7 @@ namespace Bussiness.Model.SRM
         /// </summary>
         [Required]
         [Description("计划id")]
-        public long ic_plan_id { get; set; }
+        public long? ic_plan_id { get; set; }
         /// <summary>
         /// 采购负责人
         /// </summary>
@@ -83,13 +83,13 @@ namespace Bussiness.Model.SRM
         /// </summary>
         [Required]
         [Description("采购订单差异科目代码")]
-        public long pov_acct { get; set; }
+        public long? pov_acct { get; set; }
         /// <summary>
         /// 采购发票差异科目代码
         /// </summary>
         [Required]
         [Description("采购发票差异科目代码")]
-        public long piv_acct { get; set; }
+        public long? piv_acct { get; set; }
 
     }
 }

MicroServices/Business/Bussiness.Model/Sale/crm_seorderentry.cs

@@ -25,7 +25,7 @@ namespace Bussiness.Model.Sale
         /// 销售订单id
         /// </summary>
         [Description("销售订单id")]
-        public long seorder_id { get; set; }
+        public long? seorder_id { get; set; }
 
         /// <summary>
         /// 销售订单编号

MicroServices/Business/Bussiness.Model/Sale/crm_seorderprog.cs

@@ -22,7 +22,7 @@ namespace Bussiness.Model.Sale
         /// </summary>
         [Required]
         [Description("销售订单id")]
-        public long seorder_id { get; set; }
+        public long? seorder_id { get; set; }
 
         /// <summary>
         /// 销售订单编号

MicroServices/Business/Bussiness.Model/Sale/crm_seorderreview.cs

@@ -22,7 +22,7 @@ namespace Bussiness.Model.Sale
         /// </summary>
         [Required]
         [Description("销售订单id")]
-        public long seorder_id { get; set; }
+        public long? seorder_id { get; set; }
 
         /// <summary>
         /// 业务类型

MicroServices/Business/Bussiness.Model/Sale/wms_prdprogress.cs

@@ -36,7 +36,7 @@ namespace Bussiness.Model.Sale
         /// </summary>
         [Required]
         [Description("进度顺序")]
-        public int prdprog_seq { get; set; }
+        public int? prdprog_seq { get; set; }
 
         /// <summary>
         /// 进度状态1启用0停用

MicroServices/Business/Bussiness.Model/Sale/wms_shipnotice.cs

@@ -30,7 +30,7 @@ namespace Bussiness.Model.Sale
         /// </summary>
         [Required]
         [Description("发货计划id")]
-        public long shipplan_id { get; set; }
+        public long? shipplan_id { get; set; }
 
         /// <summary>
         /// 发货计划号

MicroServices/Business/Bussiness.Model/Sale/wms_shipnoticelist.cs

@@ -23,7 +23,7 @@ namespace Bussiness.Model.Sale
         /// </summary>
         [StringLength(80)]
         [Description("发货计划号")]
-        public long shipnotice_id { get; set; }
+        public long? shipnotice_id { get; set; }
 
         /// <summary>
         /// 发货详情id

MicroServices/Business/Bussiness.Model/SystemData/crm_customer.cs

@@ -150,7 +150,7 @@ namespace Bussiness.Model.SystemData
         /// </summary>
         [Required]
         [Description("默认运输提前期_天")]
-        public int carrying_aos { get; set; }
+        public int? carrying_aos { get; set; }
 
         /// <summary>
         /// 法人代表

MicroServices/Business/Bussiness.Model/SystemData/sys_code.cs

@@ -47,7 +47,7 @@ namespace Bussiness.Model.SystemData
         /// </summary>
         [Required]
         [Description("编码生成当前值")]
-        public long code_value { get; set; }
+        public long? code_value { get; set; }
 
         /// <summary>
         /// 中文注释

MicroServices/Business/Bussiness.Model/SystemData/sys_code_pre.cs

@@ -24,7 +24,7 @@ namespace Bussiness.Model.SystemData
         [StringLength(50)]
         [Required]
         [Description("编码生成名称")]
-        public string code_name { get; set; }
+        public string? code_name { get; set; }
 
         /// <summary>
         /// 编码生成前置名称
@@ -32,7 +32,7 @@ namespace Bussiness.Model.SystemData
         [Required]
         [StringLength(50)]
         [Description("编码生成前置名称")]
-        public string pre_name { get; set; }
+        public string? pre_name { get; set; }
 
         /// <summary>
         /// 编码生成时间
@@ -46,6 +46,6 @@ namespace Bussiness.Model.SystemData
         /// </summary>
         [Required]
         [Description("编码生成当前值")]
-        public long code_value { get; set; }
+        public long? code_value { get; set; }
     }
 }

MicroServices/Business/Bussiness.Model/SystemData/sys_config.cs

@@ -23,7 +23,7 @@ namespace Bussiness.Model.SystemData
         /// </summary>
         [Description("配置类型")]
         [StringLength(50)]
-        public string type { get; set; }
+        public string? type { get; set; }
 
         /// <summary>
         /// 账务状态（0-关帐，1-开帐）

MicroServices/Business/Bussiness.Model/SystemData/sys_post_staff.cs

@@ -21,12 +21,12 @@ namespace Bussiness.Model.SystemData
         /// 员工id
         /// </summary>
         [Description("员工id")]
-        public long staff_id { get; set; }
+        public long? staff_id { get; set; }
 
         /// <summary>
         /// 岗位id
         /// </summary>
         [Description("岗位id")]
-        public long post_id { get; set; }
+        public long? post_id { get; set; }
     }
 }

MicroServices/Business/Bussiness.Model/SystemData/sys_shift_invalid_time.cs

@@ -21,7 +21,7 @@ namespace Bussiness.Model.SystemData
         /// 班次id
         /// </summary>
         [Description("班次id")]
-        public long schedule_id { get; set; }
+        public long? schedule_id { get; set; }
 
 
         /// <summary>

MicroServices/Business/Bussiness.Model/SystemData/sys_shift_schedule.cs

@@ -22,13 +22,13 @@ namespace Bussiness.Model.SystemData
         /// </summary>
         [StringLength(50)]
         [Description("班制id")]
-        public long shift_id { get; set; }
+        public long? shift_id { get; set; }
 
         /// <summary>
         /// 班次id
         /// </summary>
         [StringLength(255)]
         [Description("班次id")]
-        public long schedule_id { get; set; }
+        public long? schedule_id { get; set; }
     }
 }

MicroServices/Business/Bussiness.Model/Tech/mes_process.cs

@@ -33,7 +33,7 @@ namespace Bussiness.Model.Tech
         [StringLength(100)]
         [Description("工序名称")]
         [BsonRepresentation(MongoDB.Bson.BsonType.String)]
-        public string proc_name { get; set; }
+        public string? proc_name { get; set; }
 
         /// <summary>
         /// 简述

MicroServices/Business/Bussiness.Model/Tech/mes_tech_proc_accessory.cs

@@ -23,14 +23,14 @@ namespace Bussiness.Model.Tech
         /// </summary>
         [Required]
         [Description("工艺工序主键")]
-        public long tech_proc_id { get; set; }
+        public long? tech_proc_id { get; set; }
 
         /// <summary>
         /// 工装id
         /// </summary>
         [Required]
         [Description("工装id")]
-        public long equip_id { get; set; }
+        public long? equip_id { get; set; }
 
         /// <summary>
         /// 工装编号
@@ -38,13 +38,13 @@ namespace Bussiness.Model.Tech
         [Required]
         [StringLength(100)]
         [Description("工装编号")]
-        public string equip_no { get; set; }
+        public string? equip_no { get; set; }
 
         /// <summary>
         /// 数量
         /// </summary>
         [Required]
         [Description("数量")]
-        public int qty { get; set; }
+        public int? qty { get; set; }
     }
 }

MicroServices/Business/Bussiness.Model/Tech/mes_tech_proc_document.cs

@@ -23,14 +23,14 @@ namespace Bussiness.Model.Tech
         /// </summary>
         [Required]
         [Description("工艺工序主键")]
-        public long tech_proc_id { get; set; }
+        public long? tech_proc_id { get; set; }
 
         /// <summary>
         /// 作业指导书主键
         /// </summary>
         [Required]
         [Description("作业指导书主键")]
-        public long upload_id { get; set; }
+        public long? upload_id { get; set; }
 
         /// <summary>
         /// 作业指导书名称

MicroServices/Business/Bussiness.Model/Tech/mes_tech_proc_equipment.cs

@@ -23,7 +23,7 @@ namespace Bussiness.Model.Tech
         /// </summary>
         [Required]
         [Description("设备id")]
-        public long equip_id { get; set; }
+        public long? equip_id { get; set; }
 
         /// <summary>
         /// 设备名称
@@ -37,7 +37,7 @@ namespace Bussiness.Model.Tech
         /// </summary>
         [Required]
         [Description("工艺工序id")]
-        public long tech_proc_id { get; set; }
+        public long? tech_proc_id { get; set; }
 
         /// <summary>
         /// 工作日历id

MicroServices/Business/Bussiness.Model/Tech/mes_tech_proc_icitem.cs

@@ -23,20 +23,20 @@ namespace Bussiness.Model.Tech
         /// </summary>
         [Required]
         [Description("工艺工序id")]
-        public long tech_proc_id { get; set; }
+        public long? tech_proc_id { get; set; }
 
         /// <summary>
         /// 物料id
         /// </summary>
         [Required]
         [Description("物料id")]
-        public long icitem_id { get; set; }
+        public long? icitem_id { get; set; }
 
         /// <summary>
         /// 数量
         /// </summary>
         [Required]
         [Description("数量")]
-        public int qty { get; set; }
+        public int? qty { get; set; }
     }
 }

MicroServices/Business/Bussiness.Model/Tech/mes_tech_proc_workshop.cs

@@ -23,14 +23,14 @@ namespace Bussiness.Model.Tech
         /// </summary>
         [Required]
         [Description("工艺工序id")]
-        public long tech_proc_id { get; set; }
+        public long? tech_proc_id { get; set; }
 
         /// <summary>
         /// 工位id
         /// </summary>
         [Required]
         [Description("工位id")]
-        public long workshop_id { get; set; }
+        public long? workshop_id { get; set; }
 
         /// <summary>
         /// 序列号

MicroServices/Business/Bussiness.Model/Tech/mes_tech_proc_workshop_staff.cs

@@ -23,14 +23,14 @@ namespace Bussiness.Model.Tech
         /// </summary>
         [Required]
         [Description("工艺工位id")]
-        public long tech_proc_workshop_id { get; set; }
+        public long? tech_proc_workshop_id { get; set; }
 
         /// <summary>
         /// 员工id
         /// </summary>
         [Required]
         [Description("员工id")]
-        public long staff_id { get; set; }
+        public long? staff_id { get; set; }
 
         /// <summary>
         /// 员工姓名

MicroServices/Business/Bussiness.Model/Tech/mes_tech_process.cs

@@ -24,28 +24,28 @@ namespace Bussiness.Model.Tech
         /// </summary>
         [Required]
         [Description("工艺主键")]
-        public long tech_id { get; set; }
+        public long? tech_id { get; set; }
 
         /// <summary>
         /// 工序主键
         /// </summary>
         [Required]
         [Description("工序主键")]
-        public long proc_id { get; set; }
+        public long? proc_id { get; set; }
 
         /// <summary>
         /// 组合层级
         /// </summary>
         [Required]
         [Description("组合层级")]
-        public int level { get; set; }
+        public int? level { get; set; }
 
         /// <summary>
         /// 是否需要排产:1-是;0-否
         /// </summary>
         [Required]
         [Description("是否需要排产:1-是;0-否")]
-        public int is_schedule { get; set; }
+        public int? is_schedule { get; set; }
 
         /// <summary>
         /// 前置准备时间
@@ -92,7 +92,7 @@ namespace Bussiness.Model.Tech
         /// </summary>
         [Required]
         [Description("效率计算类型 1-节拍时间；2-UPH")]
-        public int type { get; set; }
+        public int? type { get; set; }
 
         /// <summary>
         /// UPH

MicroServices/Business/Bussiness.Model/Tech/mes_technique.cs

@@ -26,14 +26,14 @@ namespace Bussiness.Model.Tech
         [StringLength(100)]
         [Description("工艺路径名称")]
         [BsonRepresentation(MongoDB.Bson.BsonType.String)]
-        public string tech_name { get; set; }
+        public string? tech_name { get; set; }
 
         /// <summary>
         /// 效率计算层级
         /// </summary>
         [Required]
         [Description("效率计算层级")]
-        public int level { get; set; }
+        public int? level { get; set; }
 
         /// <summary>
         /// 产品

MicroServices/Business/Bussiness.Model/Tech/mes_work_calendar_list.cs

@@ -23,7 +23,7 @@ namespace Bussiness.Model.Tech
         /// </summary>
         [Required]
         [Description("工作日历id")]
-        public long work_calendar_id { get; set; }
+        public long? work_calendar_id { get; set; }
 
         /// <summary>
         /// 日期

MicroServices/Business/Bussiness.Model/Tech/mes_workshop_shelf.cs

@@ -23,7 +23,7 @@ namespace Bussiness.Model.Tech
         /// </summary>
         [Required]
         [Description("工位id")]
-        public long workshop_id { get; set; }
+        public long? workshop_id { get; set; }
 
         /// <summary>
         /// 线边仓序列号