1.出入库期货现货2加仓库其他负责人字段

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WarehouseBaseInfo.java

@@ -76,6 +76,14 @@ public class WarehouseBaseInfo extends BaseModel<WarehouseBaseInfo> {
      * 负责人电话
      */
     private String personPhone;
+    /**
+     * 其他负责人
+     */
+    private String otherPersonCharge;
+    /**
+     * 其他负责人电话
+     */
+    private String otherPersonPhone;
     /**
      * 仓库所在地省
      */

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

@@ -437,19 +437,30 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                     purchaseReceiptReport.setStatus(StatusEnum.FORM_REVIEWED.getName());
                     if (purchaseOrder != null) {
                         purchaseReceiptReport.setUnitPrice(purchaseOrder.getUnitPrice());
-                        purchaseReceiptReport.setBasisPrice(purchaseOrder.getBasis());
                         purchaseReceiptReport.setUnloadingCharge(purchaseOrder.getUnloadingCharge());
                         purchaseReceiptReport.setInvoiceFee(purchaseOrder.getInvoiceFee());
+                        //期货
+                        if (purchaseOrder.getBasis()!=null){
+                            purchaseReceiptReport.setBasisPrice(purchaseOrder.getBasis());
+                            BigDecimal unitPrice = new BigDecimal(Float.toString(purchaseReceiptReport.getUnitPrice()));
+                            BigDecimal basis = new BigDecimal(Float.toString(purchaseReceiptReport.getBasisPrice()));
+                            BigDecimal unloadingCharge = new BigDecimal(Float.toString(purchaseReceiptReport.getUnloadingCharge()));
+                            BigDecimal invoiceFee = new BigDecimal(Float.toString(purchaseReceiptReport.getInvoiceFee()));
+                            BigDecimal deductionAmount = new BigDecimal(Float.toString(purchaseReceiptReport.getDeductionAmount()));
+                            purchaseReceiptReport.setSettlementPrice(unitPrice.add(basis).add(unloadingCharge).add(invoiceFee).add(deductionAmount).floatValue());
+                        }
+                        //现货
+                        else {
+                            BigDecimal unitPrice = new BigDecimal(Float.toString(purchaseReceiptReport.getUnitPrice()));
+                            BigDecimal unloadingCharge = new BigDecimal(Float.toString(purchaseReceiptReport.getUnloadingCharge()));
+                            BigDecimal invoiceFee = new BigDecimal(Float.toString(purchaseReceiptReport.getInvoiceFee()));
+                            BigDecimal deductionAmount = new BigDecimal(Float.toString(purchaseReceiptReport.getDeductionAmount()));
+                            purchaseReceiptReport.setSettlementPrice(unitPrice.add(unloadingCharge).add(invoiceFee).add(deductionAmount).floatValue());
+
+                        }
                         purchaseReceiptReport.setCustomerName(purchaseOrder.getSeller());
                         purchaseReceiptReport.setInvoiceType(purchaseOrder.getType());
                         purchaseReceiptReport.setInvoiceTypeKey(purchaseOrder.getType());
-                        BigDecimal unitPrice = new BigDecimal(Float.toString(purchaseReceiptReport.getUnitPrice()));
-                        BigDecimal basis = new BigDecimal(Float.toString(purchaseReceiptReport.getBasisPrice()));
-                        BigDecimal unloadingCharge = new BigDecimal(Float.toString(purchaseReceiptReport.getUnloadingCharge()));
-                        BigDecimal invoiceFee = new BigDecimal(Float.toString(purchaseReceiptReport.getInvoiceFee()));
-                        BigDecimal deductionAmount = new BigDecimal(Float.toString(purchaseReceiptReport.getDeductionAmount()));
-
-                        purchaseReceiptReport.setSettlementPrice(unitPrice.add(basis).add(unloadingCharge).add(invoiceFee).add(deductionAmount).floatValue());
                         purchaseReceiptReport.setAmountIngPayable(CalculationUtil.mulToFloat(purchaseReceiptReport.getSettlementPrice(), purchaseReceiptReport.getNetWeight()));
                         purchaseReceiptReport.setAmountEdPayable(0f);
                         purchaseReceiptReport.setAmountNotPayable(purchaseReceiptReport.getAmountIngPayable());
@@ -592,21 +603,27 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                     salesDeliveryReport.setStatus(StatusEnum.FORM_REVIEWED.getName());
                     if (saleOrder != null) {
                         salesDeliveryReport.setUnitPrice(saleOrder.getUnitPrice());
-                        salesDeliveryReport.setBasisPrice(saleOrder.getBasis());
                         salesDeliveryReport.setInvoiceFee(saleOrder.getInvoiceFee());
+                        //期货
+                        if (saleOrder.getBasis()!=null){
+                            salesDeliveryReport.setBasisPrice(saleOrder.getBasis());
+                            BigDecimal unitPrice = new BigDecimal(Float.toString(salesDeliveryReport.getUnitPrice()));
+                            BigDecimal basis = new BigDecimal(Float.toString(salesDeliveryReport.getBasisPrice()));
+                            BigDecimal invoiceFee = new BigDecimal(Float.toString(salesDeliveryReport.getInvoiceFee()));
+                            salesDeliveryReport.setSettlementPrice(unitPrice.add(basis).add(invoiceFee).floatValue());
+                            tranCarInfo.setSettlementPrice(saleOrder.getUnitPrice() + saleOrder.getBasis() + saleOrder.getInvoiceFee());
+                        }
+                        //现货
+                        else{
+                            BigDecimal unitPrice = new BigDecimal(Float.toString(salesDeliveryReport.getUnitPrice()));
+                            BigDecimal invoiceFee = new BigDecimal(Float.toString(salesDeliveryReport.getInvoiceFee()));
+                            salesDeliveryReport.setSettlementPrice(unitPrice.add(invoiceFee).floatValue());
+                            tranCarInfo.setSettlementPrice(saleOrder.getUnitPrice()+ saleOrder.getInvoiceFee());
+                        }
                         salesDeliveryReport.setCustomerName(saleOrder.getBuyer());
-
-                        BigDecimal unitPrice = new BigDecimal(Float.toString(salesDeliveryReport.getUnitPrice()));
-                        BigDecimal basis = new BigDecimal(Float.toString(salesDeliveryReport.getBasisPrice()));
-                        BigDecimal invoiceFee = new BigDecimal(Float.toString(salesDeliveryReport.getInvoiceFee()));
-
-                        salesDeliveryReport.setSettlementPrice(unitPrice.add(basis).add(invoiceFee).floatValue());
                         salesDeliveryReport.setCollectionIngPayable(CalculationUtil.mulToFloat(salesDeliveryReport.getSettlementPrice(), salesDeliveryReport.getNetWeight()));
                         salesDeliveryReport.setCollectionEdPayable(0f);
                         salesDeliveryReport.setCollectionNotPayable(salesDeliveryReport.getCollectionIngPayable());
-                        if (saleOrder != null) {
-                            tranCarInfo.setSettlementPrice(saleOrder.getUnitPrice() + saleOrder.getBasis() + saleOrder.getInvoiceFee());
-                        }
                         tranCarInfoService.insert(tranCarInfo);
                     }