|
|
|
@ -278,7 +278,7 @@ public class PoundlistServiceImpl extends ServiceImpl<PoundlistMapper, Poundlist
|
|
|
|
|
PoundlistEntity model = personList.get(i);
|
|
|
|
|
if (StringUtils.isBlank(model.getCustomerName()) && StringUtils.isBlank(model.getVehicleName()) && model.getGrossWeight() == null
|
|
|
|
|
&& model.getTareWeight() == null && model.getSettlement() == null && StringUtils.isBlank(model.getUnit())
|
|
|
|
|
&& model.getSalesPrice()==null && StringUtils.isBlank(model.getSalesAmount())) {
|
|
|
|
|
&& StringUtils.isBlank(model.getSalesAmount())) {
|
|
|
|
|
}else{
|
|
|
|
|
dataRowMap.put("customerName", model.getCustomerName());
|
|
|
|
|
dataRowMap.put("vehicleName", model.getVehicleName());
|
|
|
|
@ -286,7 +286,6 @@ public class PoundlistServiceImpl extends ServiceImpl<PoundlistMapper, Poundlist
|
|
|
|
|
dataRowMap.put("tareWeight", model.getTareWeight());
|
|
|
|
|
dataRowMap.put("settlement", model.getSettlement());
|
|
|
|
|
dataRowMap.put("unit", model.getUnit());
|
|
|
|
|
dataRowMap.put("salesPrice", model.getSalesPrice());
|
|
|
|
|
dataRowMap.put("salesAmount", model.getSalesAmount());
|
|
|
|
|
dataRow.add(dataRowMap);
|
|
|
|
|
}
|
|
|
|
@ -331,8 +330,7 @@ public class PoundlistServiceImpl extends ServiceImpl<PoundlistMapper, Poundlist
|
|
|
|
|
map.put(4, "皮重");
|
|
|
|
|
map.put(5, "结算重量");
|
|
|
|
|
map.put(6, "单位");
|
|
|
|
|
map.put(7, "销售单价");
|
|
|
|
|
map.put(8, "销售金额");
|
|
|
|
|
map.put(7, "销售金额");
|
|
|
|
|
return map.get(key);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|