瀏覽代碼

销售出库报表,随行就市

zxz 3 年之前
父節點
當前提交
f28ff9f139

+ 8 - 5
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseInOutInfoServiceImpl.java

@@ -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());