在途物资

src/main/java/com/jeeplus/modules/sg/balancedlibrary/onPassageMaterials/service/OnPassageMaterialsService.java

@@ -54,11 +54,13 @@ public class OnPassageMaterialsService extends CrudService<OnPassageMaterialsMap
             //根据提报人 找到对应部门
             String reportPersonOfDepartment = reportPersonMap.get(opm.getPlanner());
             //如果没有部门 表示空部门 物料编码-部门
-            String key = opm.getMaterialCode() + "-" + reportPersonOfDepartment;
+            String key = opm.getMaterialCode() + "-" + (reportPersonOfDepartment==null?"":reportPersonOfDepartment);
+            System.out.println("----------->" + key);
             if (onPassageMaterialsMap.containsKey(key)) {
                 onPassageMaterialsMap.put(key, new BigDecimal(opm.getContractCount()).add(onPassageMaterialsMap.get(key)));
             } else {
-                onPassageMaterialsMap.put(key, new BigDecimal(opm.getContractCount()));
+                if(!opm.getMaterialCode().isEmpty()&& !opm.getContractCount().isEmpty())
+                    onPassageMaterialsMap.put(key, new BigDecimal(opm.getContractCount()));
             }
         });
 
@@ -69,9 +71,9 @@ public class OnPassageMaterialsService extends CrudService<OnPassageMaterialsMap
             if (materialInformationMap.containsKey(key)) {
 					materialInformationMap.put(key, new BigDecimal(m.getTotal()).add(materialInformationMap.get(key)));
             } else {
-                if(!m.getMaterialCode().isEmpty()&&!m.getTotal().isEmpty()){
+                if(!m.getMaterialCode().isEmpty()&&!m.getTotal().isEmpty())
                     materialInformationMap.put(key, new BigDecimal(m.getTotal()));
-                }
+
             }
         });
 
@@ -106,7 +108,4 @@ public class OnPassageMaterialsService extends CrudService<OnPassageMaterialsMap
         return map;
     }
 
-
-
-
 }

src/main/webapp/webpage/modules/sg/balancedlibrary/onPassageMaterials/onPassageMaterialsList.jsp

@@ -51,6 +51,13 @@
             // 发送请求
             xmlRequest.send(formData);
 
+            var file1 = $('#onPassageMaterials');
+            file1.after(file1.clone()).val("");
+            file1.remove();
+            var file2 = $('#materialInformation');
+            file2.after(file2.clone()).val("");
+            file2.remove();
+
             // 请求获得响应之后,触发下面的回调函数
             xmlRequest.onload = function (oEvent) {
                 // 当时满足下面的状态码的时候,视为下载成功
@@ -82,6 +89,7 @@
                     document.body.removeChild(elink);
                     URL.revokeObjectURL(src);
 
+                    window.location.reload();
                 }
             }