随行就市

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/TranProcessInfoServiceImpl.java

@@ -473,8 +473,14 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                                         stockSaleReceiptReport.setFeedbackPerson(commonStaff.getStaffName());
                                         stockSaleReceiptReport.setNetWeight(tranCarInfo.getUnloadNetWeight());
                                         stockSaleReceiptReport.setSettlementWeight(tranCarInfo.getUnloadNetWeight());
-                                        stockSaleReceiptReport.setAmountIngReceivable(tranCarInfo.getUnloadNetWeight() *
-                                                (Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice()))));
+                                        if(contractManagementInfo.getUnitContractPrice()!=null) {
+                                            stockSaleReceiptReport.setAmountIngReceivable(tranCarInfo.getUnloadNetWeight() *
+                                                    (Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice()))));
+                                        }
+                                        //随行就市
+                                        else {
+                                            stockSaleReceiptReport.setAmountIngReceivable(tranCarInfo.getUnloadNetWeight() *tranCarInfo.getContractPrice());
+                                        }
                                         stockSaleReceiptReport.setAmountEdReceivable(0.0f);
                                         stockSaleReceiptReport.setAmountNotReceivable(stockSaleReceiptReport.getAmountIngReceivable());
                                         stockSaleReceiptReport.setStatusFlag(StatusEnum.TO_BE_RECEIVED.getFlag());
@@ -497,8 +503,14 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                                         stockSaleReceiptReport.setFeedbackPerson(commonStaff.getStaffName());
                                         stockSaleReceiptReport.setNetWeight(tranCarInfo.getUnloadNetWeight());
                                         stockSaleReceiptReport.setSettlementWeight(tranCarInfo.getUnloadNetWeight());
-                                        stockSaleReceiptReport.setAmountIngReceivable(tranCarInfo.getUnloadNetWeight() *
-                                                (Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice()))));
+                                        if(contractManagementInfo.getUnitContractPrice()!=null) {
+                                            stockSaleReceiptReport.setAmountIngReceivable(tranCarInfo.getUnloadNetWeight() *
+                                                    (Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice()))));
+                                        }
+                                        //随行就市
+                                        else {
+                                            stockSaleReceiptReport.setAmountIngReceivable(tranCarInfo.getUnloadNetWeight() *tranCarInfo.getContractPrice());
+                                        }
                                         stockSaleReceiptReport.setAmountEdReceivable(0.0f);
                                         stockSaleReceiptReport.setAmountNotReceivable(stockSaleReceiptReport.getAmountIngReceivable());
                                         stockSaleReceiptReport.setStatusFlag(StatusEnum.TO_BE_RECEIVED.getFlag());
@@ -522,8 +534,14 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                                         stockSaleReceiptReport.setFeedbackPerson(commonStaff.getStaffName());
                                         stockSaleReceiptReport.setNetWeight(tranCarInfo.getUnloadNetWeight());
                                         stockSaleReceiptReport.setSettlementWeight(tranCarInfo.getUnloadNetWeight());
-                                        stockSaleReceiptReport.setAmountIngReceivable(tranCarInfo.getUnloadNetWeight() *
-                                                (Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice()))));
+                                        if(contractManagementInfo.getUnitContractPrice()!=null) {
+                                            stockSaleReceiptReport.setAmountIngReceivable(tranCarInfo.getUnloadNetWeight() *
+                                                    (Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice()))));
+                                        }
+                                        //随行就市
+                                        else {
+                                            stockSaleReceiptReport.setAmountIngReceivable(tranCarInfo.getUnloadNetWeight() *tranCarInfo.getContractPrice());
+                                        }
                                         stockSaleReceiptReport.setAmountEdReceivable(0.0f);
                                         stockSaleReceiptReport.setAmountNotReceivable(stockSaleReceiptReport.getAmountIngReceivable());
                                         stockSaleReceiptReport.setStatusFlag(StatusEnum.TO_BE_RECEIVED.getFlag());
@@ -548,8 +566,14 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                                         stockSaleReceiptReport.setFeedbackPerson(commonStaff.getStaffName());
                                         stockSaleReceiptReport.setNetWeight(tranCarInfo.getUnloadNetWeight());
                                         stockSaleReceiptReport.setSettlementWeight(tranCarInfo.getUnloadNetWeight());
-                                        stockSaleReceiptReport.setAmountIngReceivable(tranCarInfo.getUnloadNetWeight() *
-                                                (Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice()))));
+                                        if(contractManagementInfo.getUnitContractPrice()!=null) {
+                                            stockSaleReceiptReport.setAmountIngReceivable(tranCarInfo.getUnloadNetWeight() *
+                                                    (Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice()))));
+                                        }
+                                        //随行就市
+                                        else {
+                                            stockSaleReceiptReport.setAmountIngReceivable(tranCarInfo.getUnloadNetWeight() *tranCarInfo.getContractPrice());
+                                        }
                                         stockSaleReceiptReport.setAmountEdReceivable(0.0f);
                                         stockSaleReceiptReport.setAmountNotReceivable(stockSaleReceiptReport.getAmountIngReceivable());
                                         stockSaleReceiptReport.setStatusFlag(StatusEnum.TO_BE_RECEIVED.getFlag());