Przeglądaj źródła

同步数据问题提交。

tangdi 3 lat temu
rodzic
commit
f46e758725

+ 1 - 1
MicroServices/Business/Business.Application/SyncDataManagement/SyncMySQLDataAppService.cs

@@ -185,7 +185,7 @@ namespace Business.SyncDataManagement
             }
 
             //同步物料BOM明细数据
-            var icbom_childs =  _mysql_ic_bom_child.GetListAsync().Result;
+            var icbom_childs = _mysql_ic_bom_child.GetListAsync(s => s.tenant_id == 101).Result;
             if (icbom_childs.Count > 0)
             {
                 //先清空表数据

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

@@ -48,12 +48,12 @@ namespace Bussiness.Model.MES.IC
         /// 序号
         /// </summary>
         [Comment("序号")]
-        public int bom_num { get; set; }
+        public int? bom_num { get; set; }
         /// <summary>
         /// 使用状态
         /// </summary>
         [Comment("使用状态")]
-        public int fse_status { get; set; }
+        public int? fse_status { get; set; }
         /// <summary>
         /// 生效日期
         /// </summary>

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

@@ -31,7 +31,7 @@ namespace Bussiness.Model.MES.IC
         /// </summary>
         [Required]
         [Comment("是否是BOM")]
-        public int is_bom { get; set; }
+        public int? is_bom { get; set; }
         /// <summary>
         /// 物料id
         /// </summary>
@@ -72,17 +72,17 @@ namespace Bussiness.Model.MES.IC
         /// 是否倒冲
         /// </summary>
         [Comment("是否倒冲")]
-        public int backflush { get; set; }
+        public int? backflush { get; set; }
         /// <summary>
         /// 是否关键件
         /// </summary>
         [Comment("是否关键件")]
-        public int iskeyitem { get; set; }
+        public int? iskeyitem { get; set; }
         /// <summary>
         /// 存在替代关系
         /// </summary>
         [Comment("存在替代关系")]
-        public int haveicsubs { get; set; }
+        public int? haveicsubs { get; set; }
         /// <summary>
         /// 群组代码
         /// </summary>
@@ -93,7 +93,7 @@ namespace Bussiness.Model.MES.IC
         /// 是否群组替代
         /// </summary>
         [Comment("是否群组替代")]
-        public int is_replace { get; set; }
+        public int? is_replace { get; set; }
         /// <summary>
         /// 组合模式
         /// </summary>
@@ -110,22 +110,22 @@ namespace Bussiness.Model.MES.IC
         /// 顺序号
         /// </summary>
         [Comment("顺序号")]
-        public int entryid { get; set; }
+        public int? entryid { get; set; }
         /// <summary>
         /// 物料类型
         /// </summary>
         [Comment("物料类型")]
-        public int type { get; set; }
+        public int? type { get; set; }
         /// <summary>
         /// 物料属性
         /// </summary>
         [Comment("物料属性")]
-        public int erp_cls { get; set; }
+        public int? erp_cls { get; set; }
         /// <summary>
         /// 使用状态
         /// </summary>
         [Comment("使用状态")]
-        public int use_status { get; set; }
+        public int? use_status { get; set; }
         /// <summary>
         /// 生效日期
         /// </summary>
@@ -145,7 +145,7 @@ namespace Bussiness.Model.MES.IC
         /// 序号
         /// </summary>
         [Comment("序号")]
-        public int child_num { get; set; }
+        public int? child_num { get; set; }
 
        /// <summary>
         /// 版本

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

@@ -49,17 +49,17 @@ namespace Bussiness.Model.MES.IC
         /// </summary>
         [Required]
         [Comment("领料类型")]
-        public long pick_type { get; set; }
+        public long? pick_type { get; set; }
         /// <summary>
         /// 是否采用业务批次管理
         /// </summary>
         [Comment("是否采用业务批次管理")]
-        public int batch_manager { get; set; }
+        public int? batch_manager { get; set; }
         /// <summary>
         /// 是否需要库龄管理
         /// </summary>
         [Comment("是否需要库龄管理")]
-        public int stock_time { get; set; }
+        public int? stock_time { get; set; }
         /// <summary>
         /// 盘点周期单位
         /// </summary>
@@ -76,7 +76,7 @@ namespace Bussiness.Model.MES.IC
         /// 每周_月第天
         /// </summary>
         [Comment("每周_月第天")]
-        public int days_per { get; set; }
+        public int? days_per { get; set; }
         /// <summary>
         /// 上次盘点日期
         /// </summary>
@@ -87,25 +87,25 @@ namespace Bussiness.Model.MES.IC
         /// </summary>
         [Required]
         [Comment("默认待检仓库")]
-        public long default_chkloc { get; set; }
+        public long? default_chkloc { get; set; }
         /// <summary>
         /// 默认待检仓位
         /// </summary>
         [Required]
         [Comment("默认待检仓位")]
-        public long default_chksp { get; set; }
+        public long? default_chksp { get; set; }
         /// <summary>
         /// 默认仓库
         /// </summary>
         [Required]
         [Comment("默认仓库")]
-        public long default_loc { get; set; }
+        public long? default_loc { get; set; }
         /// <summary>
         /// 默认仓位
         /// </summary>
         [Required]
         [Comment("默认仓位")]
-        public long default_sp { get; set; }
+        public long? default_sp { get; set; }
         /// <summary>
         /// 货架信息
         /// </summary>
@@ -147,25 +147,25 @@ namespace Bussiness.Model.MES.IC
         /// </summary>
         [Required]
         [Comment("材料成本差异科目代码")]
-        public long mcv_acct { get; set; }
+        public long? mcv_acct { get; set; }
         /// <summary>
         /// 加工费差异科目代码
         /// </summary>
         [Required]
         [Comment("加工费差异科目代码")]
-        public long pcv_acct { get; set; }
+        public long? pcv_acct { get; set; }
         /// <summary>
         /// 废品损失科目代码
         /// </summary>
         [Required]
         [Comment("废品损失科目代码")]
-        public long sl_acct { get; set; }
+        public long? sl_acct { get; set; }
         /// <summary>
         /// 标准成本调整差异科目代码
         /// </summary>
         [Required]
         [Comment("标准成本调整差异科目代码")]
-        public long cav_acct { get; set; }
+        public long? cav_acct { get; set; }
         /// <summary>
         /// 库存备注
         /// </summary>

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

@@ -71,7 +71,7 @@ namespace Bussiness.Model.MES.IC
         /// 物料属性
         /// </summary>
         [Comment("物料属性")]
-        public int erp_cls { get; set; }
+        public int? erp_cls { get; set; }
         /// <summary>
         /// 物料属性名称
         /// </summary>
@@ -89,13 +89,13 @@ namespace Bussiness.Model.MES.IC
         /// </summary>
         [Required]
         [Comment("物料等级")]
-        public long item_level { get; set; }
+        public long? item_level { get; set; }
         /// <summary>
         /// 环保等级
         /// </summary>
         [Required]
         [Comment("环保等级")]
-        public long hb_level { get; set; }
+        public long? hb_level { get; set; }
         /// <summary>
         /// 单位标准工时_小时
         /// </summary>
@@ -118,7 +118,7 @@ namespace Bussiness.Model.MES.IC
         /// 是否为设备
         /// </summary>
         [Comment("是否为设备")]
-        public int is_equipment { get; set; }
+        public int? is_equipment { get; set; }
         /// <summary>
         /// 单位包装数量
         /// </summary>
@@ -135,7 +135,7 @@ namespace Bussiness.Model.MES.IC
         /// 是否关键件
         /// </summary>
         [Comment("是否关键件")]
-        public int iskeyitem { get; set; }
+        public int? iskeyitem { get; set; }
         /// <summary>
         /// 毛重
         /// </summary>
@@ -189,37 +189,37 @@ namespace Bussiness.Model.MES.IC
         /// </summary>
         [Required]
         [Comment("物料类别")]
-        public long matatt { get; set; }
+        public long? matatt { get; set; }
         /// <summary>
         /// 允许采购
         /// </summary>
         [Comment("允许采购")]
-        public int allowpur { get; set; }
+        public int? allowpur { get; set; }
         /// <summary>
         /// 允许销售
         /// </summary>
         [Comment("允许销售")]
-        public int allowsale { get; set; }
+        public int? allowsale { get; set; }
         /// <summary>
         /// 允许生产
         /// </summary>
         [Comment("允许生产")]
-        public int allowmanu { get; set; }
+        public int? allowmanu { get; set; }
         /// <summary>
         /// 允许委外
         /// </summary>
         [Comment("允许委外")]
-        public int allowout { get; set; }
+        public int? allowout { get; set; }
         /// <summary>
         /// 批号管理
         /// </summary>
         [Comment("批号管理")]
-        public int allowbatch { get; set; }
+        public int? allowbatch { get; set; }
         /// <summary>
         /// 序列号管理
         /// </summary>
         [Comment("序列号管理")]
-        public int allowserial { get; set; }
+        public int? allowserial { get; set; }
         /// <summary>
         /// 图片
         /// </summary>
@@ -231,17 +231,17 @@ namespace Bussiness.Model.MES.IC
         /// </summary>
         [Required]
         [Comment("领料类型")]
-        public long picktype { get; set; }
+        public long? picktype { get; set; }
         /// <summary>
         /// 出库类型
         /// </summary>
         [Required]
         [Comment("出库类型")]
-        public long output_type_id { get; set; }
+        public long? output_type_id { get; set; }
         /// <summary>
         /// 启用预警
         /// </summary>
         [Comment("启用预警")]
-        public int enable_warning { get; set; }
+        public int? enable_warning { get; set; }
     }
 }

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

@@ -31,13 +31,13 @@ namespace Bussiness.Model.MES.IC
         /// </summary>
         [Required]
         [Comment("采购计划id")]
-        public long ic_plan_id { get; set; }
+        public long? ic_plan_id { get; set; }
         /// <summary>
         /// 供应商id
         /// </summary>
         [Required]
         [Comment("供应商id")]
-        public long supplier_id { get; set; }
+        public long? supplier_id { get; set; }
         /// <summary>
         /// 供应商编码
         /// </summary>

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

@@ -54,12 +54,12 @@ namespace Bussiness.Model.MES.IC
         /// 计划策略
         /// </summary>
         [Comment("计划策略")]
-        public int plan_trategy { get; set; }
+        public int? plan_trategy { get; set; }
         /// <summary>
         /// 订货策略
         /// </summary>
         [Comment("订货策略")]
-        public int order_trategy { get; set; }
+        public int? order_trategy { get; set; }
         /// <summary>
         /// 订货间隔期_天
         /// </summary>
@@ -94,7 +94,7 @@ namespace Bussiness.Model.MES.IC
         /// 设置为固定再订货点
         /// </summary>
         [Comment("设置为固定再订货点")]
-        public int isfixedreorder { get; set; }
+        public int? isfixedreorder { get; set; }
         /// <summary>
         /// 安全库存数量
         /// </summary>
@@ -111,12 +111,12 @@ namespace Bussiness.Model.MES.IC
         /// 是否需要进行订补货计划的运算
         /// </summary>
         [Comment("是否需要进行订补货计划的运算")]
-        public int book_plan { get; set; }
+        public int? book_plan { get; set; }
         /// <summary>
         /// 辅助属性参与计划运算
         /// </summary>
         [Comment("辅助属性参与计划运算")]
-        public int aux_prop_plan { get; set; }
+        public int? aux_prop_plan { get; set; }
         /// <summary>
         /// 计划备注
         /// </summary>

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

@@ -29,7 +29,7 @@ namespace Bussiness.Model.MES.IC
         /// 替代类型
         /// </summary>
         [Comment("替代类型")]
-        public int substitute_type { get; set; }
+        public int? substitute_type { get; set; }
 
         /// <summary>
         /// 替代策略

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

@@ -64,7 +64,7 @@ namespace Bussiness.Model.MES.IC
         /// 群组优先级
         /// </summary>
         [Comment("群组优先级")]
-        public int order_num { get; set; }
+        public int? order_num { get; set; }
 
         /// <summary>
         /// 主料/替代料