|
@@ -9,10 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
-import java.util.Date;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
+import java.util.*;
|
|
|
import java.util.regex.Matcher;
|
|
|
import java.util.regex.Pattern;
|
|
|
|
|
@@ -139,6 +136,17 @@ public class TmstruckSelfMachineService implements ITmstruckSelfMachineService {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ try {
|
|
|
+ List<Map<String,Object>> deleteList= new ArrayList();
|
|
|
+ for(Map<String,Object> lastMap : deliveryOrderMaterialList) {
|
|
|
+ if(!(lastMap.get("materialWeight") != null && !"".equals(lastMap.get("materialWeight")))){
|
|
|
+ deleteList.add(lastMap);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ deliveryOrderMaterialList.removeAll(deleteList);
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
map.put("deliveryOrderMaterialList",deliveryOrderMaterialList);
|
|
|
}
|
|
|
}catch (Exception e){
|