新增表实体

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

@@ -134,7 +134,7 @@ namespace Bussiness.Model.Production
         /// <summary>
         /// 规格型号
         /// </summary>
-        public string specification_model { get; set; }
+        public string fmodel { get; set; }
         /// <summary>
         /// bom编码
         /// </summary>

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

@@ -7,7 +7,87 @@ using System.Threading.Tasks;
 
 namespace Bussiness.Model.Production
 {
+    /// <summary>
+    /// 工单损失时间表
+    /// </summary>
     public class mes_morder_loss_time :BaseEntity
     {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public long id { get; set; }
+        /// <summary>
+        /// 生产工单id
+        /// </summary>
+        public long morder_id { get; set; }
+        /// <summary>
+        /// 生产工单编号
+        /// </summary>
+        public string morder_no { get; set; }
+        /// <summary>
+        /// 生产工单行号
+        /// </summary>
+        public int morder_no_row { get; set; }
+        /// <summary>
+        /// 损失开始时间
+        /// </summary>
+        public DateTime start_time { get; set; }
+        /// <summary>
+        /// 损失结束时间
+        /// </summary>
+        public DateTime end_time { get; set; }
+        /// <summary>
+        /// 记录人id
+        /// </summary>
+        public long recorder_id { get; set; }
+        /// <summary>
+        /// 记录人名称
+        /// </summary>
+        public string recorder_name { get; set; }
+        /// <summary>
+        /// 人员数量
+        /// </summary>
+        public decimal staff_qty { get; set; }
+        /// <summary>
+        /// 损失时间（用户输入）
+        /// </summary>
+        public decimal loss_work_hours { get; set; }
+        /// <summary>
+        /// 系统计算损失时间
+        /// </summary>
+        public decimal sys_loss_time { get; set; }
+        /// <summary>
+        /// 工作中心id
+        /// </summary>
+        public long workc_id { get; set; }
+        /// <summary>
+        /// 工作中心名称
+        /// </summary>
+        public string workc_name { get; set; }
+        /// <summary>
+        /// 责任单位id
+        /// </summary>
+        public long dept_id { get; set; }
+        /// <summary>
+        /// 责任单位名称
+        /// </summary>
+        public string dept_name { get; set; }
+        /// <summary>
+        /// 损失时间原因
+        /// </summary>
+        public string reason { get; set; }
+        /// <summary>
+        /// 描述
+        /// </summary>
+        public string description { get; set; }
+        /// <summary>
+        /// 是否停产（0未停产，1停产）
+        /// </summary>
+        public int is_stop_production { get; set; }
+        /// <summary>
+        /// 用工卡号
+        /// </summary>
+        public string card_no { get; set; }
+        
     }
 }

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

@@ -0,0 +1,82 @@
+using Business.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Bussiness.Model.ProductionProcess
+{
+    /// <summary>
+    /// 损失时间记录表
+    /// </summary>
+    public class mes_loss_time_record : BaseEntity
+    {
+        /// <summary>
+        /// 主键ID
+        /// </summary>
+        [Key]
+        public long loss_time_record_id { get; set; }
+        /// <summary>
+        /// 工单id
+        /// </summary>
+
+        public long morder_id { get; set; }
+        /// <summary>
+        /// 工单编号
+        /// </summary>
+
+        public string morder_no { get; set; }
+        /// <summary>
+        /// 损失开始时间
+        /// </summary>
+
+        public DateTime start_time { get; set; }
+        /// <summary>
+        /// 损失结束时间
+        /// </summary>
+
+        public DateTime end_time { get; set; }
+        /// <summary>
+        /// 生产车间
+        /// </summary>
+
+        public long product_org { get; set; }
+        /// <summary>
+        /// 生产产线
+        /// </summary>
+
+        public long product_line { get; set; }
+        /// <summary>
+        /// 记录时间
+        /// </summary>
+
+        public DateTime record_time { get; set; }
+        /// <summary>
+        /// 记录人id
+        /// </summary>
+
+        public long record_id { get; set; }
+        /// <summary>
+        /// 记录人工号
+        /// </summary>
+
+        public string record_no { get; set; }
+        /// <summary>
+        /// 是否停线
+        /// </summary>
+
+        public int isstop { get; set; }
+        /// <summary>
+        /// 原因
+        /// </summary>
+
+        public string cause { get; set; }
+        /// <summary>
+        /// 问题描述
+        /// </summary>
+
+        public string desc { get; set; }
+    }
+}

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

@@ -0,0 +1,50 @@
+using Business.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Bussiness.Model.ProductionProcess
+{
+    /// <summary>
+    /// 生产动作表
+    /// </summary>
+    public class mes_meaction : BaseEntity
+    {
+        /// <summary>
+        /// 主键Id
+        /// </summary>
+        [Key]
+        public long meaction_id { get; set; }
+        /// <summary>
+        /// 生产工单id
+        /// </summary>
+        public long morder_id { get; set; }
+        /// <summary>
+        /// 生产工单号
+        /// </summary>
+        public string morder_no { get; set; }
+        /// <summary>
+        /// 操作时间
+        /// </summary>
+        public DateTime oprtime { get; set; }
+        /// <summary>
+        /// 操作类型
+        /// </summary>
+        public string oprtype { get; set; }
+        /// <summary>
+        /// 操作人id
+        /// </summary>
+        public long oprby { get; set; }
+        /// <summary>
+        /// 操作人名称
+        /// </summary>
+        public string oprbyname { get; set; }
+        /// <summary>
+        /// 操作人工号
+        /// </summary>
+        public string oprbyno { get; set; }
+    }
+}

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

@@ -0,0 +1,50 @@
+using Business.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Bussiness.Model.ProductionProcess
+{
+    /// <summary>
+    /// 产线刷卡记录
+    /// </summary>
+    public class mes_mebycard : BaseEntity
+    {
+        /// <summary>
+        /// 刷卡id
+        /// </summary>
+        [Key]
+        public long mebycard_id { get; set; }
+        /// <summary>
+        /// 生产工单号id
+        /// </summary>
+        public long mebycard_moid { get; set; }
+        /// <summary>
+        /// 生产工单号
+        /// </summary>
+        public string mebycard_mono { get; set; }
+        /// <summary>
+        /// 工序id
+        /// </summary>
+        public long mebycard_pid { get; set; }
+        /// <summary>
+        /// 工序编码
+        /// </summary>
+        public string mebycard_pno { get; set; }
+        /// <summary>
+        /// 工序名称
+        /// </summary>
+        public string mebycard_pname { get; set; }
+        /// <summary>
+        /// 刷卡人员卡号
+        /// </summary>
+        public string mebycard_byno { get; set; }
+        /// <summary>
+        /// 刷卡时间
+        /// </summary>
+        public DateTime mebycard_time { get; set; }
+    }
+}

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

@@ -0,0 +1,42 @@
+using Business.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Bussiness.Model.ProductionProcess
+{
+    /// <summary>
+    /// 生产报检记录表
+    /// </summary>
+    public class mes_merecheck : BaseEntity
+    {
+        /// <summary>
+        /// 主键Id
+        /// </summary>
+        [Key]
+        public long merecheck_id { get; set; }
+        /// <summary>
+        /// 生产工单id
+        /// </summary>
+        public long morder_id { get; set; }
+        /// <summary>
+        /// 生产工单号
+        /// </summary>
+        public string morder_no { get; set; }
+        /// <summary>
+        /// 报检数量
+        /// </summary>
+        public decimal qty { get; set; }
+        /// <summary>
+        /// 报检时间
+        /// </summary>
+        public DateTime oprtime { get; set; }
+        /// <summary>
+        /// 报检人id
+        /// </summary>
+        public long oprby { get; set; }
+    }
+}

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

@@ -0,0 +1,51 @@
+using Business.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Bussiness.Model.ProductionProcess
+{
+    /// <summary>
+    /// 生产报工记录表
+    /// </summary>
+    public class mes_mereport :BaseEntity
+    {
+        /// <summary>
+        /// 主键ID
+        /// </summary>
+        [Key]
+        public long mereport_id { get; set; }
+        /// <summary>
+        /// 生产工单id
+        /// </summary>
+        public long morder_id { get; set; }
+        /// <summary>
+        /// 生产工单号
+        /// </summary>
+        public string morder_no { get; set; }
+        /// <summary>
+        /// 报工数量
+        /// </summary>
+        public decimal qty { get; set; }
+        /// <summary>
+        /// 报工时间
+        /// </summary>
+        public DateTime report_time { get; set; }
+        /// <summary>
+        /// 报工人id
+        /// </summary>
+        public long report_by { get; set; }
+        /// <summary>
+        /// 报工人工号
+        /// </summary>
+        public string report_byno { get; set; }
+        /// <summary>
+        /// 已报数量
+        /// </summary>
+        public decimal instock_qty { get; set; }
+
+    }
+}

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

@@ -0,0 +1,90 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Bussiness.Model.ProductionProcess
+{
+    public class mes_prd_sendmat
+    {
+        /// <summary>
+        /// 发料单id
+        /// </summary>
+        [Key]
+        public long prdsm_id { get; set; }
+        /// <summary>
+        /// 单据类型 (发料、叫料、补料、退料)
+        /// </summary>
+        public string prdsm_type { get; set; }
+        /// <summary>
+        /// 单据编号
+        /// </summary>
+        public string prdsm_no { get; set; }
+        /// <summary>
+        /// 单据日期
+        /// </summary>
+        public DateTime prdsm_date { get; set; }
+        /// <summary>
+        /// 生产组织id
+        /// </summary>
+        public long prdsm_prdid { get; set; }
+        /// <summary>
+        /// 工作中心id
+        /// </summary>
+        public long prdsm_workcid { get; set; }
+        /// <summary>
+        /// 生产工单id
+        /// </summary>
+        public long prdsm_moid { get; set; }
+        /// <summary>
+        /// 生产工单号
+        /// </summary>
+        public string prdsm_mono { get; set; }
+        /// <summary>
+        /// 制单人
+        /// </summary>
+        public string prdsm_by { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string prdsm_note { get; set; }
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public int prdsm_state { get; set; }
+        /// <summary>
+        /// 补料理由
+        /// </summary>
+        public string prdsm_reason { get; set; }
+        /// <summary>
+        /// 退料原因
+        /// </summary>
+        //public string prdsm_breason { get; set; }
+        /// <summary>
+        /// 叫料数量
+        /// </summary>
+        public decimal prdsm_qty { get; set; }
+        /// <summary>
+        /// 配送日期
+        /// </summary>
+        public DateTime prdsm_ddate { get; set; }
+        /// <summary>
+        /// 关联委外po单号
+        /// </summary>
+        public string prdsm_po_no { get; set; }
+        /// <summary>
+        /// 关联委外po行号
+        /// </summary>
+        public int prdsm_po_row { get; set; }
+        /// <summary>
+        /// 原单类型  0 生产工单  1 委外工单
+        /// </summary>
+        public int srcbill_type { get; set; }
+        /// <summary>
+        /// 源单状态  0 初始   1 下达 2 开始往金蝶推
+        /// </summary>
+        public int srcbill_state { get; set; }
+    }
+}

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

@@ -0,0 +1,122 @@
+using Business.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Bussiness.Model.ProductionProcess
+{
+    /// <summary>
+    /// 发料单详情
+    /// </summary>
+    public class mes_prd_sendmat_list :BaseEntity
+    {
+        /// <summary>
+        /// 发料单详情id
+        /// </summary>
+        [Key]
+        public long prdsml_id { get; set; }
+        /// <summary>
+        /// 发料单id
+        /// </summary>
+        public long prdsm_id { get; set; }
+        /// <summary>
+        /// 工序编码
+        /// </summary>
+        public string prdsml_procno { get; set; }
+        /// <summary>
+        /// 工序名称
+        /// </summary>
+        public string prdsml_procname { get; set; }
+        /// <summary>
+        /// 物料编码
+        /// </summary>
+        public string fitem_number { get; set; }
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        public string fitem_name { get; set; }
+        /// <summary>
+        /// 规格型号
+        /// </summary>
+        public string fmodel { get; set; }
+        /// <summary>
+        /// 单位数量
+        /// </summary>
+        public decimal prdsml_qtyper { get; set; }
+        /// <summary>
+        /// 确认单位数量
+        /// </summary>
+        public decimal prdsml_cqtyper { get; set; }
+        /// <summary>
+        /// 计量单位
+        /// </summary>
+        public string prdsml_unit { get; set; }
+        /// <summary>
+        /// 应发数量
+        /// </summary>
+        public decimal prdsml_qtyto { get; set; }
+        /// <summary>
+        /// 计划数量
+        /// </summary>
+        public decimal prdsml_qtyplan { get; set; }
+        /// <summary>
+        /// 已发数量
+        /// </summary>
+        public decimal prdsml_qtyissued { get; set; }
+        /// <summary>
+        /// 发料仓库id
+        /// </summary>
+        public long prdsml_whid { get; set; }
+        /// <summary>
+        /// 发料仓库编码
+        /// </summary>
+        public string prdsml_whno { get; set; }
+        /// <summary>
+        /// 发料仓库名称
+        /// </summary>
+        public string prdsml_whname { get; set; }
+        /// <summary>
+        /// 退料原因
+        /// </summary>
+        public string prdsm_breason { get; set; }
+        /// <summary>
+        /// 是否倒冲 （0-否，1-是）
+        /// </summary>
+        public int fbackflush { get; set; }
+        /// <summary>
+        /// 行号
+        /// </summary>
+        public int prsml_row { get; set; }
+        /// <summary>
+        /// 子项属性
+        /// </summary>
+        public string fmateriel_type { get; set; }
+        /// <summary>
+        /// 关键件
+        /// </summary>
+        public string fisKey_item { get; set; }
+        /// <summary>
+        /// 计划发料日期
+        /// </summary>
+        public DateTime send_date { get; set; }
+        /// <summary>
+        /// 工位
+        /// </summary>
+        public string station { get; set; }
+        /// <summary>
+        /// 报废数量
+        /// </summary>
+        public decimal fdiscard_aux_qty { get; set; }
+        /// <summary>
+        /// 补料数量
+        /// </summary>
+        public decimal fqty_supply { get; set; }
+        /// <summary>
+        /// 退料数量
+        /// </summary>
+        public decimal fqty_send_back { get; set; }
+    }
+}

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

@@ -0,0 +1,52 @@
+using Business.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Bussiness.Model.ProductionProcess
+{
+    /// <summary>
+    /// 生产操作日志
+    /// </summary>
+    public class mes_prdlog :BaseEntity
+    {
+        /// <summary>
+        /// 生产操作日志id
+        /// </summary>
+        [Key]
+        public long prdlog_id { get; set; }
+
+        /// <summary>
+        /// 业务类型
+        /// </summary>
+        public string prdlog_type { get; set; }
+        /// <summary>
+        /// 关联单号
+        /// </summary>
+        public string prdlog_no { get; set; }
+        /// <summary>
+        /// 行号
+        /// </summary>
+        public int prdlog_entryid { get; set; }
+        /// <summary>
+        /// 执行时间
+        /// </summary>
+        public DateTime prdlog_time { get; set; }
+        /// <summary>
+        /// 执行人id
+        /// </summary>
+        public long prdlog_by_id { get; set; }
+        /// <summary>
+        /// 执行人姓名
+        /// </summary>
+        public string prdlog_by_name { get; set; }
+        /// <summary>
+        /// 内容
+        /// </summary>
+        public string prdlog_note { get; set; }
+     
+    }
+}

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

@@ -0,0 +1,42 @@
+using Business.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Bussiness.Model.ProductionProcess
+{
+    /// <summary>
+    /// mo的生产时间记录
+    /// </summary>
+    public class mes_product_work_time : BaseEntity
+    {
+        /// <summary>
+        /// 生产时间记录id
+        /// </summary>
+        [Key]
+        public long id { get; set; }
+        /// <summary>
+        /// 日期
+        /// </summary>
+        public DateTime work_date { get; set; }
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        public DateTime start { get; set; }
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        public DateTime stop { get; set; }
+        /// <summary>
+        /// 卡号
+        /// </summary>
+        public string card_no { get; set; }
+        /// <summary>
+        /// 产线
+        /// </summary>
+        public string product_line { get; set; }
+    }
+}

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

@@ -0,0 +1,58 @@
+using Business.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Bussiness.Model.ProductionProcess
+{
+    /// <summary>
+    /// 入库单
+    /// </summary>
+    public class mes_stock_enter : BaseEntity
+    {
+        /// <summary>
+        /// 主键id
+        /// </summary>
+        [Key]
+        public long id { get; set; }
+        /// <summary>
+        /// 物料编码
+        /// </summary>
+        public string fitem_number { get; set; }
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        public string fitem_name { get; set; }
+        /// <summary>
+        /// 全名
+        /// </summary>
+        public string ffull_name { get; set; }
+        /// <summary>
+        /// 规格型号
+        /// </summary>
+        public string fmodel { get; set; }
+        /// <summary>
+        /// 工单号
+        /// </summary>
+        public string order_no { get; set; }
+        /// <summary>
+        /// 入库日期
+        /// </summary>
+        public DateTime edate { get; set; }
+        /// <summary>
+        /// 入库数量
+        /// </summary>
+        public int eqty { get; set; }
+        /// <summary>
+        /// 入库人id
+        /// </summary>
+        public long eby { get; set; }
+        /// <summary>
+        /// 入库人姓名
+        /// </summary>
+        public string ebyname { get; set; }
+    }
+}

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

@@ -0,0 +1,83 @@
+using Business.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Bussiness.Model.ProductionProcess
+{
+    /// <summary>
+    /// 出库单
+    /// </summary>
+    public class mes_stock_out : BaseEntity
+    {
+        /// <summary>
+        /// 主键Id
+        /// </summary>
+        [Key]
+        public long id { get; set; }
+
+        /// <summary>
+        /// 出库单号
+        /// </summary>
+        public string out_no { get; set; }
+        /// <summary>
+        /// 仓库名称
+        /// </summary>
+        public string stock_name { get; set; }
+        /// <summary>
+        /// 仓库编码
+        /// </summary>
+        public string stock_no { get; set; }
+        /// <summary>
+        /// 物料编码
+        /// </summary>
+        public string fitem_number { get; set; }
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        public string fitem_name { get; set; }
+        /// <summary>
+        /// 全名
+        /// </summary>
+        public string ffull_name { get; set; }
+        /// <summary>
+        /// 规格型号
+        /// </summary>
+        public string fmodel { get; set; }
+        /// <summary>
+        /// 销售订单号
+        /// </summary>
+        public string order_no { get; set; }
+        /// <summary>
+        /// 订单行号
+        /// </summary>
+        public int order_number { get; set; }
+        /// <summary>
+        /// 发运通知单号
+        /// </summary>
+        public string shipn_no { get; set; }
+        /// <summary>
+        /// 出库日期
+        /// </summary>
+        public DateTime edate { get; set; }
+        /// <summary>
+        /// 出库数量
+        /// </summary>
+        public int eqty { get; set; }
+        /// <summary>
+        /// 计量单位
+        /// </summary>
+        public string unit { get; set; }
+        /// <summary>
+        /// 出库人id
+        /// </summary>
+        public long eby { get; set; }
+        /// <summary>
+        /// 出库人姓名
+        /// </summary>
+        public string eby_name { get; set; }
+    }
+}

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

@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Bussiness.Model.ProductionProcess
+{
+    /// <summary>
+    /// mes打卡记录表
+    /// </summary>
+    public class mes_swipe_card
+    {
+        /// <summary>
+        /// mes打卡记录id
+        /// </summary>
+        [Key]
+        public long id { get; set; }
+        /// <summary>
+        /// 生产车间
+        /// </summary>
+
+        public string product_org { get; set; }
+        /// <summary>
+        /// 生产产线
+        /// </summary>
+
+        public string product_line { get; set; }
+        /// <summary>
+        /// 卡号
+        /// </summary>
+
+        public string card_no { get; set; }
+        /// <summary>
+        /// 工单编号
+        /// </summary>
+
+        public string order_no { get; set; }
+        /// <summary>
+        /// 上线时间
+        /// </summary>
+
+        public DateTime up_line_time { get; set; }
+        /// <summary>
+        /// 下线时间
+        /// </summary>
+
+        public DateTime off_line_time { get; set; }
+        /// <summary>
+        /// 刷卡类型  1 白班 ，2 晚班
+        /// </summary>
+
+        public int type { get; set; }
+        /// <summary>
+        /// 刷卡日期
+        /// </summary>
+
+        public DateTime swipe_date { get; set; }
+    }
+}