|
@@ -222,6 +222,7 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
|
|
|
//潮粮取纯重,干粮取净重
|
|
|
if("潮粮".equals(paymentManagement1.getType())){
|
|
|
warehouseInOutInfo1.setPureWeight(paymentManagement1.getPureWeight());
|
|
|
+ warehouseInOutInfo1.setNetWeight(paymentManagement1.getPureWeight());
|
|
|
}else{
|
|
|
warehouseInOutInfo1.setNetWeight(paymentManagement1.getNetWeight());
|
|
|
}
|
|
@@ -235,9 +236,9 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
|
|
|
.eq("delete_flag", "0"));
|
|
|
// 判断是否有货
|
|
|
if (warehousePositionStorageInfo != null) {
|
|
|
- original = warehousePositionStorageInfo.getStorage() + warehouseInOutInfo.getNetWeight();
|
|
|
+ original = warehousePositionStorageInfo.getStorage() + warehouseInOutInfo1.getNetWeight();
|
|
|
// 更新库存量
|
|
|
- warehousePositionStorageInfo.setStorage(warehousePositionStorageInfo.getStorage() + warehouseInOutInfo.getNetWeight());
|
|
|
+ warehousePositionStorageInfo.setStorage(warehousePositionStorageInfo.getStorage() + warehouseInOutInfo1.getNetWeight());
|
|
|
warehousePositionStorageInfoService.updateById(warehousePositionStorageInfo);
|
|
|
}
|
|
|
// 没有货
|
|
@@ -245,10 +246,10 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
|
|
|
original=0f;
|
|
|
WarehousePositionStorageInfo warehousePositionStorageInfo1 = new WarehousePositionStorageInfo();
|
|
|
warehousePositionStorageInfo1.setId(IdGenerator.generateUUID());
|
|
|
- warehousePositionStorageInfo1.setPositionId(warehouseInOutInfo.getPositionId());
|
|
|
- warehousePositionStorageInfo1.setBinNumber(warehouseInOutInfo.getBinNumber());
|
|
|
- warehousePositionStorageInfo1.setGoodsName(warehouseInOutInfo.getGoodsName());
|
|
|
- warehousePositionStorageInfo1.setStorage(warehouseInOutInfo.getNetWeight());
|
|
|
+ warehousePositionStorageInfo1.setPositionId(warehouseInOutInfo1.getPositionId());
|
|
|
+ warehousePositionStorageInfo1.setBinNumber(warehouseInOutInfo1.getBinNumber());
|
|
|
+ warehousePositionStorageInfo1.setGoodsName(warehouseInOutInfo1.getGoodsName());
|
|
|
+ warehousePositionStorageInfo1.setStorage(warehouseInOutInfo1.getNetWeight());
|
|
|
warehousePositionStorageInfoService.insert(warehousePositionStorageInfo1);
|
|
|
}
|
|
|
}
|