@@ -2078,10 +2078,14 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
return 1;
}
} else {
- if (tWarehouse.getfTotalgross().compareTo(fGrossweight) == -1) {
+ if(tWarehouse.getfTotalgross()!=null){
+ if (tWarehouse.getfTotalgross().compareTo(fGrossweight) == -1) {
+ return 0;// 库容小于入库数
+ } else {
+ return 1;
+ }
+ }else {
return 0;// 库容小于入库数
- } else {
- return 1;