前端数字不换行问题，提示重复append情况

src/main/java/com/jeeplus/modules/sg/financial/settlement/mapper/xml/DonorMaterialMapper.xml

@@ -291,7 +291,7 @@
 			#{erpCredit.itemId},
 			#{eqmMaterialDetails2},
 			#{mtlUnit},
-			#{examinedNum},
+			'0',
 			#{mtlNumbers}
 		)
 	</insert>

src/main/java/com/jeeplus/modules/sg/financial/settlement/web/ProjectBudgetController.java

@@ -535,6 +535,8 @@ public class ProjectBudgetController extends BaseController {
         try {
             StringBuilder nullMsg = new StringBuilder();
             StringBuilder notMsg = new StringBuilder();
+            StringBuilder costNullMsg = new StringBuilder();
+            StringBuilder costNotMsg = new StringBuilder();
             StringBuilder returnMsg = new StringBuilder();
 //			读取第一个页签 根据表头两个字段判断是否符合规范。。
             ImportUtil importUtil = new ImportUtil(file, 0, 0);
@@ -630,7 +632,7 @@ public class ProjectBudgetController extends BaseController {
                         notMsg.append("项目编号" + a + "费用入账有误;");
                     }
                 }
-                if (notExit.size() > 0 || "".equals(nullMsg.toString())) {
+                if (notExit.size() > 0) {
                     if (notExit.size() > 0) {
                         for (String a :
                                 notExit) {
@@ -646,7 +648,16 @@ public class ProjectBudgetController extends BaseController {
                     j.setMsg(returnMsg.toString());
                     j.setSuccess(false);
                     return j;
+                } else {
+                    if (null != nullMsg && !"".equals(nullMsg)) {
+                        returnMsg.append(nullMsg);
+                    }
+                    if (null != notMsg && !"".equals(notMsg)) {
+                        returnMsg.append(notMsg);
+                    }
+                    j.setMsg(returnMsg.toString());
                 }
+
                 //判断可以生成结算书后保存信息
                 ValidationUtils.storeListToRedis(request,erpCredits,ValidationUtils.CREDIT_KEY_PREFIX);
 
@@ -686,12 +697,12 @@ public class ProjectBudgetController extends BaseController {
                         int i = donorMaterialService.verifyProjectMaterial(erpCreditChild2s, itemId);
                         //将有问题的信息记录下来
                         if (i == 0) {
-                            notMsg.append("成本项目编号" + itemId + "无甲供材数据;");
+                            costNotMsg.append("成本项目编号" + itemId + "无甲供材数据;");
                             //修改项目donor_material_check状态
                             projectBudgetService.updateCheck(itemId, "donor_material_check", "2");
                             e.setItemName(e.getItemName() + "未通过财务检查");
                         } else if (i == 2) {
-                            notMsg.append("成本项目编号" + itemId + "领料未完成;");
+                            costNotMsg.append("成本项目编号" + itemId + "领料未完成;");
                             //修改项目donor_material_check状态
                             projectBudgetService.updateCheck(itemId, "donor_material_check", "2");
                             e.setItemName(e.getItemName() + "未通过财务检查");
@@ -707,11 +718,11 @@ public class ProjectBudgetController extends BaseController {
                 List<String> notPass = stringListMap.get("notPass");
                 //费用检查缺少基础数据
                 //判断是否存在缺失应付金额或者甲供材审定信息的项目
-                if (notExit.size() > 0 || "".equals(nullMsg.toString()) || notPass.size() > 0) {
+                if (notExit.size() > 0 || notPass.size() > 0) {
                     if (notExit.size() > 0) {
                         for (String a :
                                 notExit) {
-                            nullMsg.append("项目编号" + a + "缺少应付金额;");
+                            costNullMsg.append("项目编号" + a + "缺少应付金额;");
                         }
                     }
                     for (String a :
@@ -722,14 +733,14 @@ public class ProjectBudgetController extends BaseController {
                                 e.setItemName(e.getItemName() + "未通过财务检查");
                             }
                         }
-                        notMsg.append("项目编号" + a + "费用入账有误;");
+                        costNotMsg.append("项目编号" + a + "费用入账有误;");
                     }
                 }
-                if (null != nullMsg && !"".equals(nullMsg)) {
-                    returnMsg.append(nullMsg);
+                if (null != costNullMsg && !"".equals(costNullMsg)) {
+                    returnMsg.append(costNullMsg);
                 }
-                if (null != notMsg && !"".equals(notMsg)) {
-                    returnMsg.append(notMsg);
+                if (null != costNotMsg && !"".equals(costNotMsg)) {
+                    returnMsg.append(costNotMsg);
                 }
                 j.setMsg(returnMsg.toString());
             }

src/main/webapp/webpage/modules/sg/financial/settlement/donorMaterialList.js

@@ -100,57 +100,46 @@
             columns: [
                 {
                     field: 'projectId',
-                    width: '150px',
                     title: '项目编码'
                 }
                 ,{
                     field: 'projectName',
-                    width: '200px',
                     title: '项目名称'
                 }
                 ,{
                     field: 'materialType',
-                    width: '130px',
                     title: '物料类别'
                 }
                 ,{
                     field: 'materialCode',
-                    width: '130px',
                     title: '物料编码'
                 }
                 ,{
                     field: 'materialName',
-                    width: '130px',
                     title: '材料名称'
                 }
                 ,{
                     field: 'materialDescribe',
-                    width: '130px',
                     title: '物料描述'
                 }
                 ,{
                     field: 'unit',
-                    width: '130px',
                     title: '单位'
                 }
                 ,{
                     field: 'examinedNum',
-                    width: '130px',
                     title: '审定数量',
                 }
                 ,{
                     field: 'erpNum',
-                    width: '130px',
                     title: 'erp数量'
                 }
                 ,{
                     field: 'erpDifferent',
-                    width: '130px',
                     title: '差额'
                 },{
                     field: 'remarks',
                     title: '备注',
-                    width: '130px',
                     events: operateEvents,
                     formatter: function (value,row,index) {
                         let option

src/main/webapp/webpage/modules/sg/financial/settlement/donorMaterialList.jsp

@@ -76,7 +76,7 @@
             </div>
 
             <!-- 表格 -->
-            <table id="dataTable" style="table-layout:fixed" data-toolbar="#toolbar"></table>
+            <table id="dataTable" style="table-layout:fixed;word-break:break-all; word-wrap:break-word;" data-toolbar="#toolbar"></table>
         </div>
     </div>
 </div>