소스 검색

添加decimal属性限制。

tangdi 3 년 전
부모
커밋
385e1ae6d8

+ 1 - 0
MicroServices/Business/Bussiness.Model/MES/IC/ic_bom.cs

@@ -17,6 +17,7 @@ namespace Bussiness.Model.MES.IC
         /// <summary>
         /// 主键
         /// </summary>
+        [Key]
         public long bom_id { get; set; }
         /// <summary>
         /// bom单编号

+ 4 - 1
MicroServices/Business/Bussiness.Model/MES/IC/ic_bom_child.cs

@@ -1,4 +1,5 @@
-using Business.Models;
+using Business.EntityFrameworkCore;
+using Business.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -42,10 +43,12 @@ namespace Bussiness.Model.MES.IC
         /// <summary>
         /// 用量
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal qty { get; set; }
         /// <summary>
         /// 损耗率
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal scrap { get; set; }
         /// <summary>
         /// 是否倒冲

+ 12 - 1
MicroServices/Business/Bussiness.Model/MES/IC/ic_factory_details.cs

@@ -1,4 +1,5 @@
-using Business.Models;
+using Business.EntityFrameworkCore;
+using Business.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -61,6 +62,7 @@ namespace Bussiness.Model.MES.IC
         /// <summary>
         /// 盘点周期
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal check_cycle { get; set; }
         /// <summary>
         /// 每周_月第天
@@ -99,18 +101,22 @@ namespace Bussiness.Model.MES.IC
         /// <summary>
         /// 最低存量
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal low_limit { get; set; }
         /// <summary>
         /// 最高存量
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal high_limit { get; set; }
         /// <summary>
         /// 最大订货量
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal qty_max { get; set; }
         /// <summary>
         /// 日消耗量
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal daily_consume { get; set; }
         /// <summary>
         /// 材料成本差异科目代码
@@ -136,22 +142,27 @@ namespace Bussiness.Model.MES.IC
         /// <summary>
         /// 工单发料时间/天
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal ordissu_days { get; set; }
         /// <summary>
         /// 原材料收货处理时间/天
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal raw_matreceiv_days { get; set; }
         /// <summary>
         /// 成品入库时间/天
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal prdenter_days { get; set; }
         /// <summary>
         /// 原材料入库时间/天
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal mat_enter_days { get; set; }
         /// <summary>
         /// 成品发货时间/天
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal prd_out_days { get; set; }
 
     }

+ 11 - 1
MicroServices/Business/Bussiness.Model/MES/IC/ic_item.cs

@@ -1,4 +1,5 @@
-using Business.Models;
+using Business.EntityFrameworkCore;
+using Business.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -79,10 +80,12 @@ namespace Bussiness.Model.MES.IC
         /// <summary>
         /// 单位标准工时_小时
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal standard_manhour { get; set; }
         /// <summary>
         /// 单位材料定额_元
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal unititem_amount { get; set; }
         /// <summary>
         /// 来源
@@ -96,6 +99,7 @@ namespace Bussiness.Model.MES.IC
         /// <summary>
         /// 单位包装数量
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal unit_qty { get; set; }
         /// <summary>
         /// 严格进行二维码数量校验
@@ -109,10 +113,12 @@ namespace Bussiness.Model.MES.IC
         /// <summary>
         /// 毛重
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal gross_weight { get; set; }
         /// <summary>
         /// 净重
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal net_weight { get; set; }
         /// <summary>
         /// 重量单位
@@ -122,6 +128,7 @@ namespace Bussiness.Model.MES.IC
         /// <summary>
         /// 长度
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal length { get; set; }
         /// <summary>
         /// 长度单位
@@ -131,14 +138,17 @@ namespace Bussiness.Model.MES.IC
         /// <summary>
         /// 宽度
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal width { get; set; }
         /// <summary>
         /// 高度
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal height { get; set; }
         /// <summary>
         /// 体积
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal size { get; set; }
         /// <summary>
         /// 物料类别

+ 8 - 2
MicroServices/Business/Bussiness.Model/MES/IC/icitem_inventory.cs → MicroServices/Business/Bussiness.Model/MES/IC/ic_item_inventory.cs

@@ -1,4 +1,5 @@
-using Business.Models;
+using Business.EntityFrameworkCore;
+using Business.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -11,7 +12,7 @@ namespace Bussiness.Model.MES.IC
     /// <summary>
     /// 物料库存明细表
     /// </summary>
-    public class icitem_inventory:BaseEntity
+    public class ic_item_inventory:BaseEntity
     {
         /// <summary>
         /// 主键
@@ -47,14 +48,17 @@ namespace Bussiness.Model.MES.IC
         /// <summary>
         /// 数量
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal qty { get; set; }
         /// <summary>
         /// 金额
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal bal { get; set; }
         /// <summary>
         /// 保质期时长
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal kf_period { get; set; }
         /// <summary>
         /// 保质期时间
@@ -63,10 +67,12 @@ namespace Bussiness.Model.MES.IC
         /// <summary>
         /// 锁定库存
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal qty_lock { get; set; }
         /// <summary>
         /// 安全库存
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal sec_qty { get; set; }
         /// <summary>
         /// 单位

+ 5 - 2
MicroServices/Business/Bussiness.Model/MES/IC/icitem_pur.cs → MicroServices/Business/Bussiness.Model/MES/IC/ic_item_pur.cs

@@ -1,4 +1,5 @@
-using Business.Models;
+using Business.EntityFrameworkCore;
+using Business.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -11,7 +12,7 @@ namespace Bussiness.Model.MES.IC
     /// <summary>
     /// 物料采购报价单
     /// </summary>
-    public class icitem_pur : BaseEntity
+    public class ic_item_pur : BaseEntity
     {
         /// <summary>
         /// 主键
@@ -62,10 +63,12 @@ namespace Bussiness.Model.MES.IC
         /// <summary>
         /// 采购净价(不含税)
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal netpurchase_price { get; set; }
         /// <summary>
         /// 税率
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal taxrate { get; set; }
         /// <summary>
         /// 币种

+ 5 - 2
MicroServices/Business/Bussiness.Model/MES/IC/icitem_stock.cs → MicroServices/Business/Bussiness.Model/MES/IC/ic_item_stock.cs

@@ -1,4 +1,5 @@
-using Business.Models;
+using Business.EntityFrameworkCore;
+using Business.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -11,7 +12,7 @@ namespace Bussiness.Model.MES.IC
     /// <summary>
     /// 物料库存表
     /// </summary>
-    public class icitem_stock : BaseEntity
+    public class ic_item_stock : BaseEntity
     {
         /// <summary>
         /// 主键
@@ -29,10 +30,12 @@ namespace Bussiness.Model.MES.IC
         /// <summary>
         /// 物料库存量
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal sqty { get; set; }
         /// <summary>
         /// 调拨在途数量
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal quantity_in_transit { get; set; }
         /// <summary>
         /// 工厂编码

+ 0 - 1
MicroServices/Business/Bussiness.Model/MES/IC/ic_metering_unit.cs

@@ -59,7 +59,6 @@ namespace Bussiness.Model.MES.IC
         /// <summary>
         /// 数量精度
         /// </summary>
-        [StringLength(80)]
         public int qty_decimal { get; set; }
 
     }

+ 9 - 1
MicroServices/Business/Bussiness.Model/MES/IC/ic_plan.cs

@@ -1,4 +1,5 @@
-using Business.Models;
+using Business.EntityFrameworkCore;
+using Business.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -44,6 +45,7 @@ namespace Bussiness.Model.MES.IC
         /// <summary>
         /// 固定提前期(天)
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal fix_leadtime { get; set; }
         /// <summary>
         /// 计划策略
@@ -56,18 +58,22 @@ namespace Bussiness.Model.MES.IC
         /// <summary>
         /// 订货间隔期_天
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal order_inter_val { get; set; }
         /// <summary>
         /// 变动提前期
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal lead_time { get; set; }
         /// <summary>
         /// 变动提前期批量
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal bat_change_economy { get; set; }
         /// <summary>
         /// 累计提前期
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal total_tqq { get; set; }
         /// <summary>
         /// 再订货点
@@ -81,10 +87,12 @@ namespace Bussiness.Model.MES.IC
         /// <summary>
         /// 安全库存数量
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal secinv { get; set; }
         /// <summary>
         /// 安全库存触发采购比例
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal secinv_ratio { get; set; }
         /// <summary>
         /// 是否需要进行订补货计划的运算

+ 6 - 1
MicroServices/Business/Bussiness.Model/MES/IC/ic_purchase.cs

@@ -1,4 +1,5 @@
-using Business.Models;
+using Business.EntityFrameworkCore;
+using Business.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -53,18 +54,22 @@ namespace Bussiness.Model.MES.IC
         /// <summary>
         /// 采购单价
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal order_price { get; set; }
         /// <summary>
         /// 销售单价
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal sale_price { get; set; }
         /// <summary>
         /// 最小订货量
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal qty_min { get; set; }
         /// <summary>
         /// 批量增量
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal batch_append_qty { get; set; }
         /// <summary>
         /// 采购订单差异科目代码

+ 14 - 1
MicroServices/Business/Bussiness.Model/MES/PO/po_list.cs

@@ -1,4 +1,5 @@
-using Business.Models;
+using Business.EntityFrameworkCore;
+using Business.Models;
 using Microsoft.VisualBasic;
 using System;
 using System.Collections.Generic;
@@ -76,26 +77,32 @@ namespace Bussiness.Model.MES.PO
         /// <summary>
         /// 订单数量
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal qty { get; set; }
         /// <summary>
         /// 净价
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal netprice { get; set; }
         /// <summary>
         /// 税率
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal rate { get; set; }
         /// <summary>
         /// 含税单价
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal price { get; set; }
         /// <summary>
         /// 总价
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal total_price { get; set; }
         /// <summary>
         /// 计划数量
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal plan_qty { get; set; }
         /// <summary>
         /// 单位
@@ -120,26 +127,32 @@ namespace Bussiness.Model.MES.PO
         /// <summary>
         /// 已收货数量
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal rqty { get; set; }
         /// <summary>
         /// 已入库数量
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal esqty { get; set; }
         /// <summary>
         /// 采购到货日期
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal procurement_rarr_date { get; set; }
         /// <summary>
         /// 再计划到货日期
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal rparrive_date { get; set; }
         /// <summary>
         /// 供应商交期
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal purchase_date { get; set; }
         /// <summary>
         /// 采购确认到货日期
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal pur_affirmdate { get; set; }
         /// <summary>
         /// 币别

+ 5 - 1
MicroServices/Business/Bussiness.Model/MES/PO/po_main.cs

@@ -1,4 +1,5 @@
-using Business.Models;
+using Business.EntityFrameworkCore;
+using Business.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -50,6 +51,7 @@ namespace Bussiness.Model.MES.PO
         /// <summary>
         /// 订单总价
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal po_total { get; set; }
         /// <summary>
         /// 交货方式
@@ -58,6 +60,7 @@ namespace Bussiness.Model.MES.PO
         /// <summary>
         /// 税率
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal po_tax_rate { get; set; }
         /// <summary>
         /// 是否加急
@@ -79,6 +82,7 @@ namespace Bussiness.Model.MES.PO
         /// <summary>
         /// 评审次数
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal rnumber { get; set; }
         /// <summary>
         /// 评审通过时间

+ 3 - 1
MicroServices/Business/Bussiness.Model/MES/PO/po_occupy.cs

@@ -1,4 +1,5 @@
-using Business.Models;
+using Business.EntityFrameworkCore;
+using Business.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -45,6 +46,7 @@ namespace Bussiness.Model.MES.PO
         /// <summary>
         /// 占用量
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal qty { get; set; }
         /// <summary>
         /// 开始时间

+ 11 - 1
MicroServices/Business/Bussiness.Model/MES/PO/pr_main.cs

@@ -1,4 +1,5 @@
-using Business.Models;
+using Business.EntityFrameworkCore;
+using Business.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
@@ -59,14 +60,17 @@ namespace Bussiness.Model.MES.PO
         /// <summary>
         /// 需求数量
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal pr_rqty { get; set; }
         /// <summary>
         /// 申请数量
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal pr_aqty { get; set; }
         /// <summary>
         /// 建议数量
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal pr_sqty { get; set; }
         /// <summary>
         /// 物料id
@@ -120,18 +124,22 @@ namespace Bussiness.Model.MES.PO
         /// <summary>
         /// 系统价格(含税)
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal pr_sysprice { get; set; }
         /// <summary>
         /// 订单价格(含税)
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal pr_orderprice { get; set; }
         /// <summary>
         /// 采购净价(不含税)
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal pr_price { get; set; }
         /// <summary>
         /// 税率
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal pr_rate { get; set; }
         /// <summary>
         /// 单位
@@ -144,6 +152,7 @@ namespace Bussiness.Model.MES.PO
         /// <summary>
         /// 已申请数量
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal old_apply_aqty { get; set; }
         /// <summary>
         /// 申请类型
@@ -156,6 +165,7 @@ namespace Bussiness.Model.MES.PO
         /// <summary>
         /// 安全库存触发采购比例
         /// </summary>
+        [DecimalPrecision(20, 8)]
         public decimal secInv_ratio { get; set; }
         /// <summary>
         /// 备注