wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
DEVICE8\12494
2023-04-26 10:15:10 +08:00
parent b891501756
commit f13a3c2ac8
5 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
ProductionMgr/Tnb.ProductionMgr.Entitys/Entity/BasItem.cs
View File

@@ -1,132 +0,0 @@
using System;
using System.Linq;
using System.Text;
using SqlSugar;
namespace Tnb.ProductionMgr.Entitys.Entity
{
///<summary>
///产品信息
///</summary>
[SugarTable("bas_item")]
public partial class BasItem
{
public BasItem(){
}
/// <summary>
/// Desc:主键
/// Default:
/// Nullable:False
/// </summary>
[SugarColumn(IsPrimaryKey=true)]
public string id {get;set;}
/// <summary>
/// Desc:产品代码
/// Default:
/// Nullable:False
/// </summary>
public string item_code {get;set;}
/// <summary>
/// Desc:产品分类ID
/// Default:
/// Nullable:False
/// </summary>
public string categoryid {get;set;}
/// <summary>
/// Desc:关联比例
/// Default:
/// Nullable:True
/// </summary>
public decimal? relation_ratio {get;set;}
/// <summary>
/// Desc:创建时间
/// Default:
/// Nullable:True
/// </summary>
public DateTime? create_time {get;set;}
/// <summary>
/// Desc:修改时间
/// Default:
/// Nullable:True
/// </summary>
public DateTime? modify_time {get;set;}
/// <summary>
/// Desc:扩展字段
/// Default:
/// Nullable:True
/// </summary>
public string extras {get;set;}
/// <summary>
/// Desc:所属组织ID
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string org_id {get;set;}
/// <summary>
/// Desc:产品名称
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string item_name {get;set;}
/// <summary>
/// Desc:产品规格型号
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string item_standard {get;set;}
/// <summary>
/// Desc:物料ID，BAS_MATERIAL.ID
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string material_id {get;set;}
/// <summary>
/// Desc:产品类型： 半成品：SemiManufacture 成品：FinishedProduct
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string item_type {get;set;}
/// <summary>
/// Desc:备注
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string remark {get;set;}
/// <summary>
/// Desc:时间戳(用于并发控制)
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string timestamp {get;set;}
/// <summary>
/// Desc:创建用户
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string create_id {get;set;}
/// <summary>
/// Desc:修改用户
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string modify_id {get;set;}
}
}

223
ProductionMgr/Tnb.ProductionMgr.Entitys/Entity/EqpEquipment.cs
View File

@@ -1,223 +0,0 @@
using System;
using System.Linq;
using System.Text;
using SqlSugar;
namespace Tnb.ProductionMgr.Entitys.Entity
{
///<summary>
///设备登记
///</summary>
[SugarTable("eqp_equipment")]
public partial class EqpEquipment
{
public EqpEquipment(){
}
/// <summary>
/// Desc:自增ID
/// Default:
/// Nullable:False
/// </summary>
[SugarColumn(IsPrimaryKey=true)]
public string id {get;set;}
/// <summary>
/// Desc:设备代码
/// Default:
/// Nullable:False
/// </summary>
public string eqp_code {get;set;}
/// <summary>
/// Desc:设备名称
/// Default:
/// Nullable:False
/// </summary>
public string eqp_name {get;set;}
/// <summary>
/// Desc:设备类型代码
/// Default:
/// Nullable:False
/// </summary>
public string eqp_type_code {get;set;}
/// <summary>
/// Desc:验收状态（合格：Qualified/不合格：Unqualified）
/// Default:
/// Nullable:False
/// </summary>
public string accept_status {get;set;}
/// <summary>
/// Desc:使用部门代码
/// Default:
/// Nullable:False
/// </summary>
public string use_department_code {get;set;}
/// <summary>
/// Desc:安装日期
/// Default:
/// Nullable:False
/// </summary>
public string install_date {get;set;}
/// <summary>
/// Desc:创建时间
/// Default:
/// Nullable:True
/// </summary>
public DateTime? create_time {get;set;}
/// <summary>
/// Desc:修改时间
/// Default:
/// Nullable:True
/// </summary>
public DateTime? modify_time {get;set;}
/// <summary>
/// Desc:扩展字段
/// Default:
/// Nullable:True
/// </summary>
public string extras {get;set;}
/// <summary>
/// Desc:模具Id
/// Default:
/// Nullable:True
/// </summary>
public string mold_id {get;set;}
/// <summary>
/// Desc:所属组织ID
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string org_id {get;set;}
/// <summary>
/// Desc:设备类型ID，EQP_EQUIPMENTTYPE.ID
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string eqp_type_id {get;set;}
/// <summary>
/// Desc:设备生产日期
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string product_date {get;set;}
/// <summary>
/// Desc:设备生产厂家
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string supplier_code {get;set;}
/// <summary>
/// Desc:正式使用日期
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string use_date {get;set;}
/// <summary>
/// Desc:验收日期
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string accept_date {get;set;}
/// <summary>
/// Desc:管理部门
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string manage_department_code {get;set;}
/// <summary>
/// Desc:工段（车间）代码
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string segment_code {get;set;}
/// <summary>
/// Desc:工位代码
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string station_code {get;set;}
/// <summary>
/// Desc:质检代码，良率计算
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string quality_station_code {get;set;}
/// <summary>
/// Desc:生产节拍
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string process_time {get;set;}
/// <summary>
/// Desc:时间单位： 秒：s 分钟：m 小时：h
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string time_unit {get;set;}
/// <summary>
/// Desc:设备当前状态，状态代码
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string current_status {get;set;}
/// <summary>
/// Desc:技术性能
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string techno_logy {get;set;}
/// <summary>
/// Desc:备注
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string remark {get;set;}
/// <summary>
/// Desc:时间戳
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string timestamp {get;set;}
/// <summary>
/// Desc:创建用户
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string create_id {get;set;}
/// <summary>
/// Desc:修改用户
/// Default:NULL::character varying
/// Nullable:True
/// </summary>
public string modify_id {get;set;}
}
}

17
ProductionMgr/Tnb.ProductionMgr/PrdMoService.cs
View File

@@ -9,9 +9,8 @@ using Mapster;
using Microsoft.AspNetCore.Mvc;
using SqlSugar;
using Tnb.BasicData.Entitys;
using Tnb.ProductionMgr.Entitys;
using Tnb.ProductionMgr.Entitys.Dto.PrdManage;
using Tnb.ProductionMgr.Entitys.Dto.WorkOrder;
using Tnb.BasicData.Entitys.Entity;
using Tnb.ProductionMgr.Entitys.Dto;
using Tnb.ProductionMgr.Entitys.Entity;
using Tnb.ProductionMgr.Interfaces;
@@ -284,7 +283,7 @@ namespace Tnb.ProductionMgr
{
input.id ??= SnowflakeIdHelper.NextId();
var entity = input.Adapt<PrdTask>();
entity.status = DictionaryConstants.ToBeStartedEnCode; //任务单状态默认，待排产
entity.status = DictConst.ToBeStartedEnCode; //任务单状态默认，待排产
entity.create_id = _userManager.UserId;
entity.create_time = DateTime.Now;
entity.prd_task_id = input.id;
@@ -307,7 +306,7 @@ namespace Tnb.ProductionMgr
icmoEntities.ForEach(x =>
{
x.id = SnowflakeIdHelper.NextId();
x.status = DictionaryConstants.ToBeStartedEnCode; //任务单状态默认，待排产
x.status = DictConst.ToBeStartedEnCode; //任务单状态默认，待排产
x.create_id = _userManager.UserId;
x.create_time = DateTime.Now;
x.prd_task_id = input.id;
@@ -364,7 +363,7 @@ namespace Tnb.ProductionMgr
if (item != null)
{
item.input_qty += x.scheduled_qty;
item.mo_status = MoStatus.WaitProductId;
item.mo_status = DictConst.WaitProductId;
}
});
}
@@ -379,7 +378,7 @@ namespace Tnb.ProductionMgr
if (item != null)
{
item.input_qty += x.scheduled_qty;
item.mo_status = MoStatus.AlreadyId;
item.mo_status = DictConst.AlreadyId;
}
});
}
@@ -395,12 +394,12 @@ namespace Tnb.ProductionMgr
//判断，已排产数量>=计划数量时将状态改为 已排产
if (obj.input_qty >= obj.plan_qty)
{
moStatus = MoStatus.AlreadyId;
moStatus = DictConst.AlreadyId;
}
else
{
//修改工单状态为待排产，同事修改已排产数量
moStatus = MoStatus.WaitProductId;
moStatus = DictConst.WaitProductId;
}
row = await db.Updateable<PrdMo>().SetColumns(it => new PrdMo
{

2
ProductionMgr/Tnb.ProductionMgr/Tnb.ProductionMgr.csproj
View File

@@ -9,6 +9,8 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\BasicData\Tnb.BasicData.Entitys\Tnb.BasicData.Entitys.csproj" />
<ProjectReference Include="..\..\BasicData\Tnb.BasicData\Tnb.BasicData.csproj" />
<ProjectReference Include="..\..\visualdev\Tnb.VisualDev.Engine\Tnb.VisualDev.Engine.csproj" />
<ProjectReference Include="..\Tnb.ProductionMgr.Interfaces\Tnb.ProductionMgr.Interfaces.csproj" />
</ItemGroup>