超欠供明细根据甲供材申报的送审id进行数据处理

src/main/java/com/jeeplus/modules/supply/particulars/mapper/xml/SupplyParticularsMapper.xml

@@ -113,7 +113,9 @@
     </select>
 
     <select id="getMaterialsType" resultType="java.lang.String">
-        select  ifnull(materials_type,'-')  from supply_stock_out where material_number= #{materialNumber} order by update_date desc limit 1
+        select  ifnull(materials_type,'-')  from supply_stock_out
+        where material_number= #{materialNumber} and (submittals_id is null or submittals_id = '')
+        order by update_date desc limit 1
     </select>
 
     <select id="getMaterialsProvidedByAForReviewList" resultType="com.jeeplus.modules.supply.stockOut.entity.SupplyStockOut">

src/main/java/com/jeeplus/modules/supply/particulars/service/SupplyParticularsService.java

@@ -804,6 +804,26 @@ public class SupplyParticularsService extends CrudService<SupplyParticularsMappe
                         }
                     }
                 }
+            }else{
+                //如果出库单中没有数据则表示甲供材存在
+                //将该条记录存储留用
+                //通过物料编码查询物料对应的平均价格
+                String avgUtilPriceOnStockOutByMaterialNumber = mapper.getAvgUtilPriceOnStockOutByMaterialNumber(materials.getMaterialNumber());
+                materials.setUnitPrice(avgUtilPriceOnStockOutByMaterialNumber);
+                //查询材料类型添加金数据中
+                String materialsType = mapper.getMaterialsType(materials.getMaterialNumber());
+                switch (materialsType){
+                    case "设备":
+                        materials.setMaterialsType("设备");
+                        break;
+                    case "材料":
+                        materials.setMaterialsType("材料");
+                        break;
+                    case "-":
+                        materials.setMaterialsType("-");
+                        break;
+                }
+                newSupplyStockOutList.add(materials);
             }
 
             //删除map中对应key键信息
@@ -812,13 +832,13 @@ public class SupplyParticularsService extends CrudService<SupplyParticularsMappe
         }
 
         //获取所有审定单map对应的key键信息
-        Set<String> stockOutMaterialNumberListMapKeySet = stockOutMaterialNumberListMap.keySet();
+        /*Set<String> stockOutMaterialNumberListMapKeySet = stockOutMaterialNumberListMap.keySet();
         List<String> stockOutMaterialNumberListMapKeyList = new ArrayList<>(stockOutMaterialNumberListMapKeySet);
         for (String infoStr : stockOutMaterialNumberListMapKeyList ) {
             //获取出库单中对应的物料编码信息
             List<SupplyStockOut> stockOutMaterialList = stockOutMaterialNumberListMap.get(infoStr);
             newSupplyStockOutList.addAll(stockOutMaterialList);
-        }
+        }*/
 
 
         return newSupplyStockOutList;

src/main/webapp/webpage/modules/supply/particulars/supplyParticularsList.js

@@ -99,13 +99,22 @@
                     width:200,
                     sortName: 'materialDescription',
                     formatter:function(value, row , index) {
+                        var batch = row.batch;
+                        var flag = row.flag;
                         value = jp.unescapeHTML(value);
-                        var actualQuantityIssued = parseFloat(row.actualQuantityIssued);
+                        /*var actualQuantityIssued = parseFloat(row.actualQuantityIssued);
                         var examineCount = parseFloat(row.examineCount);
                         if (actualQuantityIssued === 0 && examineCount !== 0) {
                             return "<a href='javascript:viewMaterials(\"" + row.materialNumber + "\")'>" + value + "</a>";
+                        } else if(actualQuantityIssued !== 0 && examineCount === 0) {
+                            return "<a href='javascript:viewMaterials(\"" + row.materialNumber + "\")'>" + value + "</a>";
                         } else{
                             return value;
+                        }*/
+                        if('true' === flag && (undefined === batch || null === batch || ''=== batch ||'-' === batch)){
+                            return "<a href='javascript:viewMaterials(\"" + row.materialNumber + "\")'>" + value + "</a>";
+                        }else{
+                            return value;
                         }
                     }
                 }
@@ -142,12 +151,22 @@
                         type: 'text',
                         title: '单价',
                         noeditFormatter (value, row, index) {
-                            var actualQuantityIssued = parseFloat(row.actualQuantityIssued);
+                            var batch = row.batch;
+                            var flag = row.flag;
+                            /*var actualQuantityIssued = parseFloat(row.actualQuantityIssued);
                             var examineCount = parseFloat(row.examineCount);
                             if (actualQuantityIssued === 0 && examineCount !== 0) {
                                 return false
+                            }else if (actualQuantityIssued !== 0 && examineCount === 0) {
+                                return false
+                            }else{
+                                return value;
+                            }*/
+                            if('true' === flag && (undefined === batch || null === batch || ''=== batch ||'-' === batch)){
+                                return false;
+                            }else{
+                                return value;
                             }
-                            return value;
                         },
                         validate: function (value) {
                             if (isNaN(value))