提出

src/main/java/com/steerinfo/dil/service/impl/TmstruckWeightResultServiceImpl.java

@@ -209,18 +209,21 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
         tmstruckWeightResult.setResultPoundNo((String) map.get("resultPoundNo"));
         String resultCrossWeightTime = (String) map.get("resultCrossWeightTime");
         //根据传输过来的物资名称和规格型号
-        BigDecimal materialId = tmstruckWeightResultMapper.getMaterialId(map);
-        if(materialId == null){
-            throw new Exception("系统找不到该物资");
-        }
-        map.put("materialId",materialId);
-        //判断此物资是不是已经有净重了，如果有抛出异常
-        int netWeightCount = tmstruckWeightResultMapper.getHaveNetWeightByMaterial(map);
-        if(netWeightCount != 0){
-            throw new Exception("该物资已有净重，不能再次录入");
-        }
-        tmstruckWeightResult.setMaterialId(materialId);
-        tmstruckWeightResult.setMaterialNum(DataChange.dataToBigDecimal(map.get("goodNum")));
+        Object resultNetWeight = map.get("resultNetWeight");
+        if(resultNetWeight  != null && !"".equals(resultNetWeight)) {
+            BigDecimal materialId = tmstruckWeightResultMapper.getMaterialId(map);
+            if(materialId == null){
+                throw new Exception("系统找不到该物资");
+            }
+            map.put("materialId",materialId);
+            //判断此物资是不是已经有净重了，如果有抛出异常
+            int netWeightCount = tmstruckWeightResultMapper.getHaveNetWeightByMaterial(map);
+            if(netWeightCount != 0){
+                throw new Exception("该物资已有净重，不能再次录入");
+            }
+            tmstruckWeightResult.setMaterialId(materialId);
+            tmstruckWeightResult.setMaterialNum(DataChange.dataToBigDecimal(map.get("goodNum")));
+        }
         addWeightResult(tmstruckWeightResult, map); //添加计量实绩数据
         // 更新订单中路段顺序号,如果毛重时间为空则为计皮：也就是销售第一次计皮，反之有毛重时间则为计毛
         if(resultCrossWeightTime == null || resultCrossWeightTime.length() == 0){
@@ -234,7 +237,6 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
             List<Map<String, Object>> steelMapList = tmstruckWeightResultMapper.getNoNetWeightResultId(DataChange.dataToBigDecimal(map.get("resultTotalId")));
             if(steelMapList.size() >= 2){ //当前更新还未提交所以如果是拼装需要查询两个出来 以第二个为准
                 Map<String, Object> steelMap = steelMapList.get(1);
-                Object resultNetWeight = map.get("resultNetWeight");
                 if(resultNetWeight  != null && !"".equals(resultNetWeight)){
                     updateSteelAssemble(map, steelMap); //更新下一拼实绩
                     map.put("segmentSqe", steelMap.get("tareSegmentSqe")); // 修改路段顺序号直接到下一皮重路段顺序