111

src/main/java/com/jeeplus/modules/sg/managementcenter/materialinfo/entity/MaterialInfo.java

@@ -14,7 +14,7 @@ public class MaterialInfo extends DataEntity<MaterialInfo> {
     private Double weightTon;      //总重/吨
     private String supplyType;   //甲乙供
     private String note;      //备注
-    private String state;     //状态，与标准比对，1：相同 2，不相同
+    private String state;     //状态，与标准比对，1：相同 0：不相同
 
 
     public String getState() {

src/main/java/com/jeeplus/modules/sg/managementcenter/materialinfo/service/MaterialInfoService.java

@@ -96,9 +96,9 @@ public class MaterialInfoService extends CrudService<MaterialInfoMapper, Materia
 		List<MaterialInfo> materialInfos = getData(importExcel,projectName);   //sheet页数据
 //		List<MaterialInfo> list = replaceDate(materialInfos);          //对比替换数据
 		List<MaterialInfo> list = getNewData(materialInfos);      //合并后数据
-//		List<MaterialInfo> standardList = materialInfoMapper.findSat(batch);     //标准库数据
-//		List<MaterialInfo> newList = compareData(list1,standardList);    //比对之后的数据
-		saveList(list);
+		List<MaterialInfo> standardList = materialInfoMapper.findSat(batch);     //标准库数据
+		List<MaterialInfo> newList = compareData(list,standardList);    //比对之后的数据
+		saveList(newList);
 		MaterialProject materialProject = new MaterialProject();
 		materialProject.setReserveProjectName(projectName);
 		materialProject.setSuppliesBatch(batch);

src/main/webapp/webpage/modules/sg/managementcenter/materialinfo/importmore.jsp

@@ -29,6 +29,7 @@
             <div class="layui-col-md12">
                 <div class="layui-card">
                         <div class="layui-card-body" style="margin-top: 2px;">
+                            <form>
                             <div class="layui-form-item">
                                 <div class="layui-inline">
                                     <label class="layui-form-label" style="width: 100px;">*项目批次</label>
@@ -47,6 +48,7 @@
                                     <%--</div>--%>
                                 </div>
                             </div>
+                            </form>
                             <div class="layui-upload">
                                 <button type="button" class="layui-btn layui-btn-normal" id="add_List">添加文件</button>
                                 <div class="layui-upload-list">

src/main/webapp/webpage/modules/sg/managementcenter/materialinfo/materialInfoList.js

@@ -74,9 +74,11 @@ $(document).ready(function() {
                       
                    } 
                },
-              
                onClickRow: function(row, $el){
                },
+               onLoadSuccess: function (row) {  //加载成功时执行
+                   getTdValue();
+               },
                	onShowSearch: function () {
 			$("#search-collapse").slideToggle();
 		},
@@ -121,6 +123,11 @@ $(document).ready(function() {
                        field: 'note',
                        title: '备注'
                    }
+               ,{
+                       field: 'state',
+                       title : '状态'
+                   }
+
 		     ]
 		
 		});
@@ -223,6 +230,16 @@ $(document).ready(function() {
             return row.id
         });
     }
+
+    function getTdValue(){
+            var tableId = document.getElementById("dataTable");
+             // for(var i = 1;i < tableId.rows.length;i++) {
+             //     if(tableId.rows[i].cells[11].innerHTML.indexOf("1") != -1 ){
+             //       tableId.rows[i].setAttribute("style","background: #bfbfff;");
+             //       }
+             // }
+    }
+
   
   function deleteAll(){