chenjingyong
/
ds8-solution-pro
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: chenjingyong:b6288dbd5e7c66aa9cfca6ac15ffb6a721137bae
Branches Tags
chenjingyong:dev
chenjingyong:usertest
chenjingyong:master
...
compare: chenjingyong:f3be6e8d3725157744bd21adef666bf4ba91380b
Branches Tags
chenjingyong:dev
chenjingyong:usertest
chenjingyong:master

3 Commits
b6288dbd5e ... f3be6e8d37

Author SHA1 Message Date
jianghaiqing f3be6e8d37 修改服务项目映射 6 days ago
jianghaiqing 9660b5ed16 Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev 6 days ago
jianghaiqing f22373307a 修改服务项目 6 days ago
3 changed files with 207 additions and 5 deletions
Show Stats

203
ds-wms-service/DS.WMS.Core/Op/Dtos/OpMapsterSetup.cs
Unescape Escape View File

@ -139,6 +139,209 @@ namespace DS.WMS.Core.Op.Dtos.Mapper
.Map(dest => dest.IsEnable, src => src.IS_ENABLE) .Map(dest => dest.IsEnable, src => src.IS_ENABLE)
.Map(dest => dest.ServiceProjectNote, src => src.SERVICE_PROJECT_NOTE); .Map(dest => dest.ServiceProjectNote, src => src.SERVICE_PROJECT_NOTE);
} }
{
TypeAdapterConfig<ServiceWorkFlowBaseDto, ServiceWorkFlowBaseInfo>.NewConfig()
.Map(dest => dest.PK_ID, src => src.PKId)
.Map(dest => dest.SERVICE_WORKFLOW_CODE, src => src.ServiceWorkflowCode)
.Map(dest => dest.SERVICE_WORKFLOW_NAME, src => src.ServiceWorkflowName)
.Map(dest => dest.SERVICE_WORKFLOW_NOTE, src => src.ServiceWorkflowNote)
.Map(dest => dest.BELONG_TENANT_ID, src => src.BelongTenantId)
.Map(dest => dest.BELONG_TENANT_NAME, src => src.BelongTenantName);
}
{
TypeAdapterConfig<ServiceWorkFlowBaseInfo, ServiceWorkFlowBaseDto>.NewConfig()
.Map(dest => dest.PKId, src => src.PK_ID)
.Map(dest => dest.ServiceWorkflowCode, src => src.SERVICE_WORKFLOW_CODE)
.Map(dest => dest.ServiceWorkflowName, src => src.SERVICE_WORKFLOW_NAME)
.Map(dest => dest.ServiceWorkflowNote, src => src.SERVICE_WORKFLOW_NOTE)
.Map(dest => dest.BelongTenantId, src => src.BELONG_TENANT_ID)
.Map(dest => dest.BelongTenantName, src => src.BELONG_TENANT_NAME);
}
{
TypeAdapterConfig<ServiceWorkFlowBaseInfo, ServiceWorkFlowBaseShowDto>.NewConfig()
.Map(dest => dest.PKId, src => src.PK_ID)
.Map(dest => dest.ServiceWorkflowCode, src => src.SERVICE_WORKFLOW_CODE)
.Map(dest => dest.ServiceWorkflowName, src => src.SERVICE_WORKFLOW_NAME)
.Map(dest => dest.ServiceWorkflowNote, src => src.SERVICE_WORKFLOW_NOTE)
.Map(dest => dest.CreatedTime, src => src.CreateTime)
.Map(dest => dest.UpdatedTime, src => src.UpdateTime)
.Map(dest => dest.CreatedUserId, src => src.CreateBy)
.Map(dest => dest.CreatedUserName, src => src.CreateUserName)
.Map(dest => dest.UpdatedUserId, src => src.UpdateBy)
.Map(dest => dest.UpdatedUserName, src => src.UpdateUserName)
.Map(dest => dest.ReleaseVersion, src => src.RELEASE_VERSION)
.Map(dest => dest.DevelopVersion, src => src.DEVELOP_VERSION)
.Map(dest => dest.IsEnable, src => src.IS_ENABLE)
.Map(dest => dest.BelongTenantId, src => src.BELONG_TENANT_ID)
.Map(dest => dest.BelongTenantName, src => src.BELONG_TENANT_NAME)
.Map(dest => dest.StatusNum, src => src.STATUS_NUM)
.Map(dest => dest.PublishEr, src => src.PUBLISH_ER)
.Map(dest => dest.PublishName, src => src.PUBLISH_NAME)
.Map(dest => dest.PublishDate, src => src.PUBLISH_DATE)
.Map(dest => dest.IsLock, src => src.IS_LOCK);
}
{
TypeAdapterConfig<ServiceWorkFlowBaseInfo, ServiceWorkFlowBasePageDto>.NewConfig()
.Map(dest => dest.PKId, src => src.PK_ID)
.Map(dest => dest.ServiceWorkflowCode, src => src.SERVICE_WORKFLOW_CODE)
.Map(dest => dest.ServiceWorkflowName, src => src.SERVICE_WORKFLOW_NAME)
.Map(dest => dest.ServiceWorkflowNote, src => src.SERVICE_WORKFLOW_NOTE)
.Map(dest => dest.CreatedTime, src => src.CreateTime)
.Map(dest => dest.UpdatedTime, src => src.UpdateTime)
.Map(dest => dest.CreatedUserId, src => src.CreateBy)
.Map(dest => dest.CreatedUserName, src => src.CreateUserName)
.Map(dest => dest.UpdatedUserId, src => src.UpdateBy)
.Map(dest => dest.UpdatedUserName, src => src.UpdateUserName)
.Map(dest => dest.ReleaseVersion, src => src.RELEASE_VERSION)
.Map(dest => dest.DevelopVersion, src => src.DEVELOP_VERSION)
.Map(dest => dest.IsEnable, src => src.IS_ENABLE)
.Map(dest => dest.BelongTenantId, src => src.BELONG_TENANT_ID)
.Map(dest => dest.BelongTenantName, src => src.BELONG_TENANT_NAME)
.Map(dest => dest.StatusNum, src => src.STATUS_NUM)
.Map(dest => dest.PublishEr, src => src.PUBLISH_ER)
.Map(dest => dest.PublishName, src => src.PUBLISH_NAME)
.Map(dest => dest.PublishDate, src => src.PUBLISH_DATE)
.Map(dest => dest.IsLock, src => src.IS_LOCK);
}
{
TypeAdapterConfig<ServiceWorkFlowActivitiesDto, ServiceWorkFlowActivitiesInfo>.NewConfig()
.Map(dest => dest.PK_ID, src => src.PKId)
.Map(dest => dest.STATUS_SKU_ID, src => src.StatusSKUId)
.Map(dest => dest.SHOW_NAME, src => src.ShowName);
}
{
TypeAdapterConfig<ServiceWorkFlowActivitiesInfo, ServiceWorkFlowActivitiesShowDto>.NewConfig()
.Map(dest => dest.PKId, src => src.PK_ID)
.Map(dest => dest.StatusSKUId, src => src.STATUS_SKU_ID)
.Map(dest => dest.ShowName, src => src.SHOW_NAME);
}
{
TypeAdapterConfig<ServiceWorkFlowActivitiesInfo, ServiceWorkFlowActivitiesSubShowDto>.NewConfig()
.Map(dest => dest.PKId, src => src.PK_ID)
.Map(dest => dest.StatusSKUId, src => src.STATUS_SKU_ID)
.Map(dest => dest.ShowName, src => src.SHOW_NAME);
}
{
TypeAdapterConfig<ServiceWorkFlowActivitiesInfo, ServiceWorkFlowActivitiesDto>.NewConfig()
.Map(dest => dest.PKId, src => src.PK_ID)
.Map(dest => dest.StatusSKUId, src => src.STATUS_SKU_ID)
.Map(dest => dest.ShowName, src => src.SHOW_NAME);
}
{
TypeAdapterConfig<StatusTriggerBaseDto, StatusTriggerBaseInfo>.NewConfig()
.Map(dest => dest.PK_ID, src => src.PKId)
.Map(dest => dest.STATUS_TRIGGER_CODE, src => src.StatusTriggerCode)
.Map(dest => dest.STATUS_TRIGGER_NAME, src => src.StatusTriggerName)
.Map(dest => dest.STATUS_TRIGGER_NOTE, src => src.StatusTriggerNote);
}
{
TypeAdapterConfig<StatusTriggerBaseInfo, StatusTriggerBaseDto>.NewConfig()
.Map(dest => dest.PKId, src => src.PK_ID)
.Map(dest => dest.StatusTriggerCode, src => src.STATUS_TRIGGER_CODE)
.Map(dest => dest.StatusTriggerName, src => src.STATUS_TRIGGER_NAME);
}
{
TypeAdapterConfig<StatusTriggerBaseInfo, StatusTriggerBaseShowDto>.NewConfig()
.Map(dest => dest.PKId, src => src.PK_ID)
.Map(dest => dest.StatusTriggerCode, src => src.STATUS_TRIGGER_CODE)
.Map(dest => dest.StatusTriggerName, src => src.STATUS_TRIGGER_NAME)
.Map(dest => dest.CreatedTime, src => src.CreateTime)
.Map(dest => dest.UpdatedTime, src => src.UpdateTime)
.Map(dest => dest.CreatedUserId, src => src.CreateBy)
.Map(dest => dest.CreatedUserName, src => src.CreateUserName)
.Map(dest => dest.UpdatedUserId, src => src.UpdateBy)
.Map(dest => dest.UpdatedUserName, src => src.UpdateUserName)
.Map(dest => dest.IsEnable, src => src.IS_ENABLE);
}
{
TypeAdapterConfig<StatusTriggerBaseInfo, StatusTriggerBasePageDto>.NewConfig()
.Map(dest => dest.PKId, src => src.PK_ID)
.Map(dest => dest.StatusTriggerCode, src => src.STATUS_TRIGGER_CODE)
.Map(dest => dest.StatusTriggerName, src => src.STATUS_TRIGGER_NAME)
.Map(dest => dest.CreatedTime, src => src.CreateTime)
.Map(dest => dest.UpdatedTime, src => src.UpdateTime)
.Map(dest => dest.CreatedUserId, src => src.CreateBy)
.Map(dest => dest.CreatedUserName, src => src.CreateUserName)
.Map(dest => dest.UpdatedUserId, src => src.UpdateBy)
.Map(dest => dest.UpdatedUserName, src => src.UpdateUserName)
.Map(dest => dest.IsEnable, src => src.IS_ENABLE);
}
{
TypeAdapterConfig<StatusTriggerConditionDto, StatusTriggerConditionInfo>.NewConfig()
.Map(dest => dest.PK_ID, src => src.PKId)
.Map(dest => dest.SERVICE_ACTIVITIES_ID, src => src.ServiceActivitiesID)
.Map(dest => dest.SHOW_NAME, src => src.ShowName)
.Map(dest => dest.OPER_TYPE, src => src.OperType)
.Map(dest => dest.OPER_TYPE_NAME, src => src.OperTypeName)
.Map(dest => dest.OPER_TYPE_VAL, src => src.OperTypeVal)
.Map(dest => dest.NEXT_ACTION_TYPE, src => src.NextActionType)
.Map(dest => dest.NEXT_ACTION_TYPE_NAME, src => src.NextActionTypeName)
.Map(dest => dest.LIQUID_EXPRESSION, src => src.LiquidExpression);
}
{
TypeAdapterConfig<StatusTriggerConditionInfo, StatusTriggerConditionDto>.NewConfig()
.Map(dest => dest.PKId, src => src.PK_ID)
.Map(dest => dest.ServiceActivitiesID, src => src.SERVICE_ACTIVITIES_ID)
.Map(dest => dest.ShowName, src => src.SHOW_NAME)
.Map(dest => dest.OperType, src => src.OPER_TYPE)
.Map(dest => dest.OperTypeName, src => src.OPER_TYPE_NAME)
.Map(dest => dest.OperTypeVal, src => src.OPER_TYPE_VAL)
.Map(dest => dest.NextActionType, src => src.NEXT_ACTION_TYPE)
.Map(dest => dest.NextActionTypeName, src => src.NEXT_ACTION_TYPE_NAME)
.Map(dest => dest.LiquidExpression, src => src.LIQUID_EXPRESSION);
}
{
TypeAdapterConfig<StatusTriggerConditionInfo, StatusTriggerConditionShowDto>.NewConfig()
.Map(dest => dest.PKId, src => src.PK_ID)
.Map(dest => dest.ServiceActivitiesID, src => src.SERVICE_ACTIVITIES_ID)
.Map(dest => dest.ShowName, src => src.SHOW_NAME)
.Map(dest => dest.OperType, src => src.OPER_TYPE)
.Map(dest => dest.OperTypeName, src => src.OPER_TYPE_NAME)
.Map(dest => dest.OperTypeVal, src => src.OPER_TYPE_VAL)
.Map(dest => dest.NextActionType, src => src.NEXT_ACTION_TYPE)
.Map(dest => dest.NextActionTypeName, src => src.NEXT_ACTION_TYPE_NAME)
.Map(dest => dest.LiquidExpression, src => src.LIQUID_EXPRESSION)
.Map(dest => dest.CreatedTime, src => src.CreateTime)
.Map(dest => dest.UpdatedTime, src => src.UpdateTime)
.Map(dest => dest.CreatedUserId, src => src.CreateBy)
.Map(dest => dest.CreatedUserName, src => src.CreateUserName)
.Map(dest => dest.UpdatedUserId, src => src.UpdateBy)
.Map(dest => dest.UpdatedUserName, src => src.UpdateUserName);
}
{
TypeAdapterConfig<StatusTriggerConditionNextActInfo, StatusTriggerConditionNextActDto>.NewConfig()
.Map(dest => dest.PKId, src => src.PK_ID)
.Map(dest => dest.TriggerId, src => src.TRIGGER_ID)
.Map(dest => dest.ConditionId, src => src.CONDITION_ID)
.Map(dest => dest.ServiceActivitiesID, src => src.SERVICE_ACTIVITIES_ID)
.Map(dest => dest.ShowName, src => src.SHOW_NAME);
}
{
TypeAdapterConfig<StatusTriggerConditionNextActDto, StatusTriggerConditionNextActInfo>.NewConfig()
.Map(dest => dest.PK_ID, src => src.PKId)
.Map(dest => dest.TRIGGER_ID, src => src.TriggerId)
.Map(dest => dest.CONDITION_ID, src => src.ConditionId)
.Map(dest => dest.SERVICE_ACTIVITIES_ID, src => src.ServiceActivitiesID)
.Map(dest => dest.SHOW_NAME, src => src.ShowName);
}
} }
} }
} }

2
ds-wms-service/DS.WMS.OpApi/Controllers/ServiceWorkFlowBaseController.cs
Unescape Escape View File

@ -157,7 +157,7 @@ namespace DS.WMS.OpApi.Controllers
/// </summary> /// </summary>
/// <param name="info">保存服务流程活动详情</param> /// <param name="info">保存服务流程活动详情</param>
/// <returns>返回回执</returns> /// <returns>返回回执</returns>
[HttpPost("ServiceWorkFlowActivitiesDto")] [HttpPost("SaveWFActivities")]
public async Task<DataResult<string>> SaveWFActivities([FromBody] ServiceWorkFlowActivitiesDto info) public async Task<DataResult<string>> SaveWFActivities([FromBody] ServiceWorkFlowActivitiesDto info)
{ {
return await _serviceWorkFlowBaseService.SaveWFActivities(info); return await _serviceWorkFlowBaseService.SaveWFActivities(info);

7
ds-wms-service/DS.WMS.Test/SaasTest.cs
Unescape Escape View File

@ -220,10 +220,9 @@ public class SaasTest
//tenantDb.CodeFirst.InitTables(typeof(BookingSlotBase)); //tenantDb.CodeFirst.InitTables(typeof(BookingSlotBase));
//tenantDb.CodeFirst.InitTables(typeof(BookingSlotCtn)); //tenantDb.CodeFirst.InitTables(typeof(BookingSlotCtn));
//tenantDb.CodeFirst.InitTables(typeof(BookingSlotStock)); //tenantDb.CodeFirst.InitTables(typeof(BookingSlotStock));
//tenantDb.CodeFirst.InitTables(typeof(StatusSkuBaseInfo)); tenantDb.CodeFirst.InitTables(typeof(StatusSkuBaseInfo));
//tenantDb.CodeFirst.InitTables(typeof(ServiceProjectBaseInfo)); tenantDb.CodeFirst.InitTables(typeof(ServiceProjectBaseInfo));
//tenantDb.CodeFirst.InitTables(typeof(ServiceWorkFlowProjectRelation)); tenantDb.CodeFirst.InitTables(typeof(ServiceWorkFlowProjectRelation));
tenantDb.CodeFirst.InitTables(typeof(ServiceWorkFlowActivitiesInfo)); tenantDb.CodeFirst.InitTables(typeof(ServiceWorkFlowActivitiesInfo));
tenantDb.CodeFirst.InitTables(typeof(ServiceWorkFlowActivitiesRelation)); tenantDb.CodeFirst.InitTables(typeof(ServiceWorkFlowActivitiesRelation));
tenantDb.CodeFirst.InitTables(typeof(ServiceWorkFlowActivitiesSubRelation)); tenantDb.CodeFirst.InitTables(typeof(ServiceWorkFlowActivitiesSubRelation));

Write Preview
Loading…
Cancel
Save