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

20241029

Browse Source
dev
dengyu 4 weeks ago
parent e17e500b97
commit e9b60e0b43
3 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File

2
ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/CM_State_Change_Temp.cs
Unescape Escape View File

@ -22,7 +22,7 @@ public class CM_State_Change_Temp : CM_State_Change
/// <summary> /// <summary>
/// 处理结果备注 /// 处理结果备注
/// </summary> /// </summary>
[SugarColumn(ColumnDescription = "处理结果备注", IsNullable = false)] [SugarColumn(ColumnDescription = "处理结果备注", IsNullable = true)]
public string DealRemark { get; set; } public string DealRemark { get; set; }
} }

7
ds-wms-service/DS.WMS.Core/ContainerManagement/Method/CM_State_Change_TemplatImportService.cs
Unescape Escape View File

@ -1179,13 +1179,16 @@ public class CM_State_Change_TemplatImportService : CMServiceBase, ICM_State_Cha
//根据字典表对应一个值 //根据字典表对应一个值
field = type.GetProperty("CtnFlowStateId"); field = type.GetProperty("CtnFlowStateId");
if (field != null) { if (field != null) {
var tablevalue=row[字段.ColumnTitle].ToString(); if (row[字段.ColumnTitle] != null && !string.IsNullOrWhiteSpace(row[字段.ColumnTitle].ToString()))
{
var tablevalue = row[字段.ColumnTitle].ToString();
var eh = new EnumsHelper(); var eh = new EnumsHelper();
var _value=eh.GetEnumByDescription<CMCtnFlowStateEnum>(tablevalue); var _value = eh.GetEnumByDescription<CMCtnFlowStateEnum>(tablevalue);
field.SetValue(newchange, _value); field.SetValue(newchange, _value);
} }
}
} }
//else //else

54
ds-wms-service/DS.WMS.Test/ContainerManagementTest.cs
Unescape Escape View File

@ -120,33 +120,33 @@ public class ContainerManagementTest
//tenantDb.CodeFirst.InitTables(types); //指定表空间下的实体 //tenantDb.CodeFirst.InitTables(types); //指定表空间下的实体
//tenantDb.CodeFirst.InitTables(typeof(OpLetterYard));//指定更新特定实体 //tenantDb.CodeFirst.InitTables(typeof(OpLetterYard));//指定更新特定实体
tenantDb.CodeFirst.InitTables(typeof(CM_CurrentState)); //tenantDb.CodeFirst.InitTables(typeof(CM_CurrentState));
tenantDb.CodeFirst.InitTables(typeof(CM_BaseInfo)); //tenantDb.CodeFirst.InitTables(typeof(CM_BaseInfo));
tenantDb.CodeFirst.InitTables(typeof(CM_State_Change)); //tenantDb.CodeFirst.InitTables(typeof(CM_State_Change));
tenantDb.CodeFirst.InitTables(typeof(CM_RentIn)); //tenantDb.CodeFirst.InitTables(typeof(CM_RentIn));
tenantDb.CodeFirst.InitTables(typeof(CM_RentIn_Detail)); //tenantDb.CodeFirst.InitTables(typeof(CM_RentIn_Detail));
tenantDb.CodeFirst.InitTables(typeof(CM_RentOut)); //tenantDb.CodeFirst.InitTables(typeof(CM_RentOut));
tenantDb.CodeFirst.InitTables(typeof(CM_RentOut_Detail)); //tenantDb.CodeFirst.InitTables(typeof(CM_RentOut_Detail));
tenantDb.CodeFirst.InitTables(typeof(CM_RentOneWay)); //tenantDb.CodeFirst.InitTables(typeof(CM_RentOneWay));
tenantDb.CodeFirst.InitTables(typeof(CM_RentOneWay_Detail)); //tenantDb.CodeFirst.InitTables(typeof(CM_RentOneWay_Detail));
tenantDb.CodeFirst.InitTables(typeof(CM_RentOneWay_In)); //tenantDb.CodeFirst.InitTables(typeof(CM_RentOneWay_In));
tenantDb.CodeFirst.InitTables(typeof(CM_BuyCtn)); //tenantDb.CodeFirst.InitTables(typeof(CM_BuyCtn));
tenantDb.CodeFirst.InitTables(typeof(CM_BuyCtn_Detail)); //tenantDb.CodeFirst.InitTables(typeof(CM_BuyCtn_Detail));
tenantDb.CodeFirst.InitTables(typeof(CM_SellCtn)); //tenantDb.CodeFirst.InitTables(typeof(CM_SellCtn));
tenantDb.CodeFirst.InitTables(typeof(CM_SellCtn_Detail)); //tenantDb.CodeFirst.InitTables(typeof(CM_SellCtn_Detail));
tenantDb.CodeFirst.InitTables(typeof(CM_CtnScrap)); //tenantDb.CodeFirst.InitTables(typeof(CM_CtnScrap));
tenantDb.CodeFirst.InitTables(typeof(CM_CtnScrap_Detail)); //tenantDb.CodeFirst.InitTables(typeof(CM_CtnScrap_Detail));
tenantDb.CodeFirst.InitTables(typeof(CM_CustFeeDui)); //tenantDb.CodeFirst.InitTables(typeof(CM_CustFeeDui));
tenantDb.CodeFirst.InitTables(typeof(CM_CustFeeDui_Detail)); //tenantDb.CodeFirst.InitTables(typeof(CM_CustFeeDui_Detail));
tenantDb.CodeFirst.InitTables(typeof(CM_CustFeeDui_Calendar)); //tenantDb.CodeFirst.InitTables(typeof(CM_CustFeeDui_Calendar));
tenantDb.CodeFirst.InitTables(typeof(CM_State_Change_Templat)); //tenantDb.CodeFirst.InitTables(typeof(CM_State_Change_Templat));
tenantDb.CodeFirst.InitTables(typeof(CM_State_Change_TemplatDetail)); //tenantDb.CodeFirst.InitTables(typeof(CM_State_Change_TemplatDetail));
tenantDb.CodeFirst.InitTables(typeof(CM_State_Change_TemplatImport)); //tenantDb.CodeFirst.InitTables(typeof(CM_State_Change_TemplatImport));
tenantDb.CodeFirst.InitTables(typeof(CM_State_Change_Temp)); tenantDb.CodeFirst.InitTables(typeof(CM_State_Change_Temp));
} }

Write Preview
Loading…
Cancel
Save