修改

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

@@ -376,7 +376,7 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
             if(codeMap.get("orderNumber") != null) {
                 tmstruckWeightResult.setInsertUpdateRemark((String)codeMap.get("orderNumber"));
             }
-            if(resultNetWeight  != null && !"".equals(resultNetWeight) && codeMap.get("saleMaterialId") != null) {
+            if(resultNetWeight  != null && !"".equals(resultNetWeight)) {
                 codeMap.put("good",(codeMap.get("goodspa") + "" + codeMap.get("good")).replaceAll(" ",""));
                 BigDecimal materialId = tmstruckWeightResultMapper.getMaterialId(codeMap);
                 if(materialId == null){
@@ -384,6 +384,8 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
                 }
                 codeMap.put("materialId",materialId);
                 tmstruckWeightResult.setMaterialId(materialId);
+            }
+            if(resultNetWeight  != null && !"".equals(resultNetWeight) && codeMap.get("saleMaterialId") != null) {
                 tmstruckWeightResult.setMaterialNum(DataChange.dataToBigDecimal(codeMap.get("goodNum")));
                 tmstruckWeightResult.setSaleMaterialId(DataChange.dataToBigDecimal(codeMap.get("saleMaterialId")));
                 tmstruckWeightResult.setSaleMaterialId(saleMaterialId);
@@ -392,6 +394,7 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
             // 更新订单中路段顺序号,如果毛重时间为空则为计皮：也就是销售第一次计皮，反之有毛重时间则为计毛
             if(resultCrossWeightTime == null || resultCrossWeightTime.length() == 0){
                 codeMap.put("segmentSqe", codeMap.get("tareSegmentSqe")); //皮重路段顺序
+
             }else{
                 //查询有净重的路段顺序号最大的
                 BigDecimal orderLineSqe = tmstruckWeightResultMapper.selectOrderLineSqe(DataChange.dataToBigDecimal(codeMap.get("resultTotalId")));
@@ -1265,4 +1268,12 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
         tmstruckWeightBatchMapper.insertSelective(tmstruckWeightBatch);
 
     }
+
+
+    //public void updateInwardSteel(Map<String,Object> map) {
+    //    //首先获取车牌号
+    //    String capacityNum = (String) map.get("carNo");
+    //    //首先判断该车有没有正在执行的运单，且要判断有没有净重
+    //    Map<String,Object> orderMes =
+    //}
 }