|
@@ -48,14 +48,17 @@ public class OyeResultServiceImpl implements IOyeResultService {
|
|
int i = 0;
|
|
int i = 0;
|
|
for (Map<String,Object> map : mapList) {
|
|
for (Map<String,Object> map : mapList) {
|
|
if(i == 0) {
|
|
if(i == 0) {
|
|
|
|
+ i++;
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
Map<String,Object> stringObjectMap = mapList.get(i-1);
|
|
Map<String,Object> stringObjectMap = mapList.get(i-1);
|
|
if (DataChange.dataToBigDecimal(stringObjectMap.get("weightBatchId")).compareTo(DataChange.dataToBigDecimal(map.get("weightBatchId"))) == 0) {
|
|
if (DataChange.dataToBigDecimal(stringObjectMap.get("weightBatchId")).compareTo(DataChange.dataToBigDecimal(map.get("weightBatchId"))) == 0) {
|
|
map.put("netWeight",0);
|
|
map.put("netWeight",0);
|
|
|
|
+ map.put("orderNetWeight",0);
|
|
}
|
|
}
|
|
|
|
+ i++;
|
|
}
|
|
}
|
|
- return oyeInboundResultMapper.getOyeInboundResult(mapValue);
|
|
|
|
|
|
+ return mapList;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -190,6 +193,9 @@ public class OyeResultServiceImpl implements IOyeResultService {
|
|
if(materialNumber == null || materialNumber.intValue() == 0) {
|
|
if(materialNumber == null || materialNumber.intValue() == 0) {
|
|
throw new Exception("物资件数错误");
|
|
throw new Exception("物资件数错误");
|
|
}
|
|
}
|
|
|
|
+ if(netWeight == null || netWeight.intValue() == 0) {
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
//查询比例
|
|
//查询比例
|
|
BigDecimal compareValue = DataChange.dataToBigDecimal(oyeRealtimeInventoryMapper.selectCompareValue());
|
|
BigDecimal compareValue = DataChange.dataToBigDecimal(oyeRealtimeInventoryMapper.selectCompareValue());
|
|
BigDecimal theoryAdd = theoryWeightSaleMaterial.multiply(compareValue.add(new BigDecimal(1)));
|
|
BigDecimal theoryAdd = theoryWeightSaleMaterial.multiply(compareValue.add(new BigDecimal(1)));
|