|
@@ -1204,11 +1204,14 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
|
|
|
if("1".equals(contractManagementInfo.getSettlementWeightMethod())) {
|
|
|
stockSaleReceiptReport.setSettlementWeight(warehouseInOutInfo.getNetWeight());
|
|
|
}
|
|
|
- stockSaleReceiptReport.setSettlementPrice(contractManagementInfo.getUnitContractPrice());
|
|
|
- stockSaleReceiptReport.setAmountIngReceivable(warehouseInOutInfo.getNetWeight() *
|
|
|
- (contractManagementInfo.getUnitContractPrice()));
|
|
|
- stockSaleReceiptReport.setAmountEdReceivable(0.00);
|
|
|
- stockSaleReceiptReport.setAmountNotReceivable(stockSaleReceiptReport.getAmountIngReceivable());
|
|
|
+ //定价销售
|
|
|
+ if(contractManagementInfo.getUnitContractPrice()!=null) {
|
|
|
+ stockSaleReceiptReport.setSettlementPrice(contractManagementInfo.getUnitContractPrice());
|
|
|
+ stockSaleReceiptReport.setAmountIngReceivable(warehouseInOutInfo.getNetWeight() *
|
|
|
+ (contractManagementInfo.getUnitContractPrice()));
|
|
|
+ stockSaleReceiptReport.setAmountEdReceivable(0.00);
|
|
|
+ stockSaleReceiptReport.setAmountNotReceivable(stockSaleReceiptReport.getAmountIngReceivable());
|
|
|
+ }
|
|
|
stockSaleReceiptReport.setStatusFlag(StatusEnum.TO_BE_RECEIVED.getFlag());
|
|
|
stockSaleReceiptReport.setStatus(StatusEnum.TO_BE_RECEIVED.getName());
|
|
|
stockSaleReceiptReport.setSettlementWeight(stockSaleReceiptReport.getNetWeight());
|