20241029

ds-wms-service/DS.WMS.Core/ContainerManagement/Entity/CM_State_Change_Temp.cs

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

ds-wms-service/DS.WMS.Core/ContainerManagement/Method/CM_State_Change_TemplatImportService.cs

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

ds-wms-service/DS.WMS.Test/ContainerManagementTest.cs

@@ -120,33 +120,33 @@ public class ContainerManagementTest
                                                                         //tenantDb.CodeFirst.InitTables(types); //指定表空间下的实体
                                                                         //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_Detail));
-            tenantDb.CodeFirst.InitTables(typeof(CM_RentOut));
-            tenantDb.CodeFirst.InitTables(typeof(CM_RentOut_Detail));
-            tenantDb.CodeFirst.InitTables(typeof(CM_RentOneWay));
-            tenantDb.CodeFirst.InitTables(typeof(CM_RentOneWay_Detail));
-            tenantDb.CodeFirst.InitTables(typeof(CM_RentOneWay_In));
-
-            tenantDb.CodeFirst.InitTables(typeof(CM_BuyCtn));
-            tenantDb.CodeFirst.InitTables(typeof(CM_BuyCtn_Detail));
-            tenantDb.CodeFirst.InitTables(typeof(CM_SellCtn));
-            tenantDb.CodeFirst.InitTables(typeof(CM_SellCtn_Detail));
-            tenantDb.CodeFirst.InitTables(typeof(CM_CtnScrap));
-            tenantDb.CodeFirst.InitTables(typeof(CM_CtnScrap_Detail));
-
-            tenantDb.CodeFirst.InitTables(typeof(CM_CustFeeDui));
-            tenantDb.CodeFirst.InitTables(typeof(CM_CustFeeDui_Detail));
-            tenantDb.CodeFirst.InitTables(typeof(CM_CustFeeDui_Calendar));
-
 
-            tenantDb.CodeFirst.InitTables(typeof(CM_State_Change_Templat));
+            //tenantDb.CodeFirst.InitTables(typeof(CM_RentIn));
-            tenantDb.CodeFirst.InitTables(typeof(CM_State_Change_TemplatDetail));
+            //tenantDb.CodeFirst.InitTables(typeof(CM_RentIn_Detail));
-            tenantDb.CodeFirst.InitTables(typeof(CM_State_Change_TemplatImport));
+            //tenantDb.CodeFirst.InitTables(typeof(CM_RentOut));
+            //tenantDb.CodeFirst.InitTables(typeof(CM_RentOut_Detail));
+            //tenantDb.CodeFirst.InitTables(typeof(CM_RentOneWay));
+            //tenantDb.CodeFirst.InitTables(typeof(CM_RentOneWay_Detail));
+            //tenantDb.CodeFirst.InitTables(typeof(CM_RentOneWay_In));
+
+            //tenantDb.CodeFirst.InitTables(typeof(CM_BuyCtn));
+            //tenantDb.CodeFirst.InitTables(typeof(CM_BuyCtn_Detail));
+            //tenantDb.CodeFirst.InitTables(typeof(CM_SellCtn));
+            //tenantDb.CodeFirst.InitTables(typeof(CM_SellCtn_Detail));
+            //tenantDb.CodeFirst.InitTables(typeof(CM_CtnScrap));
+            //tenantDb.CodeFirst.InitTables(typeof(CM_CtnScrap_Detail));
+
+            //tenantDb.CodeFirst.InitTables(typeof(CM_CustFeeDui));
+            //tenantDb.CodeFirst.InitTables(typeof(CM_CustFeeDui_Detail));
+            //tenantDb.CodeFirst.InitTables(typeof(CM_CustFeeDui_Calendar));
+
+
+            //tenantDb.CodeFirst.InitTables(typeof(CM_State_Change_Templat));
+            //tenantDb.CodeFirst.InitTables(typeof(CM_State_Change_TemplatDetail));
+            //tenantDb.CodeFirst.InitTables(typeof(CM_State_Change_TemplatImport));
             tenantDb.CodeFirst.InitTables(typeof(CM_State_Change_Temp));
         }