分支

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderNewController.cs

@@ -3789,12 +3789,14 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 drNew["车牌号"] = it.F_CarNumber;
                                 drNew["返账金额"] = it.F_SC_CJ_ReturnAccount;
                                 drNew["责任单位"] = it.F_ZL_ResponsibleUnit;
-                                drNew["下步整改"] = it.F_ZL_ImprovementRequirements;
+                                drNew["下步整改"] = it.F_ZL_ImprovementRequirements.Replace("@#", "\n");
                                 List<T_Wo_MaterialItems> materlist = new BLL.T_Wo_MaterialItems().GetModelList($" F_WoID={it.F_ID}");
-                                if (materlist != null)
+                                if (materlist.Count>0)
                                 {
-                                  drNew["实收返厂数量"] = materlist.Sum(x => x.F_ReturnQuantity).ToString();
+                                    drNew["实收返厂数量"] = materlist.Sum(x => x.F_ReturnQuantity).ToString();
                                 }
+                                else
+                                    drNew["实收返厂数量"] = "";
 
                                 drNew["是否退换货"] = it.F_SC_PreliminaryOpinion;
 
@@ -3923,9 +3925,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 //dt.Columns.Add("该批次生产数量");
                                 drNew["原料及厂家"] = it.F_Manufacturers;//原料及厂家
                                 drNew["该批次生产数量"] = it.F_ProductionNum;//该批次生产数量
-                                drNew["问题判定原因"] = it.F_EventReason;//问题原因
-                                drNew["处理结果(内)"] = it.F_SuperiorOpinion;//处理结果(外)
-                                drNew["处理结果(内)"] = it.F_SuperiorOpinion2;//处理结果(内)
+                                if (!string.IsNullOrEmpty(it.F_EventReason))
+                                {
+                                    drNew["问题判定原因"] = it.F_EventReason.Replace("@#", "\n");//问题原因
+                                }
+                                drNew["处理结果(内)"] = it.F_SuperiorOpinion.Replace("@#", "\n");//处理结果(外)
+                                drNew["处理结果(内)"] = it.F_SuperiorOpinion2.Replace("@#", "\n");//处理结果(内)
 
                             }