修改

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/WarehouseBaseInfoController.java

@@ -232,7 +232,7 @@ public class WarehouseBaseInfoController {
     }
 
     /**
-     * 合同利润详情列表查询
+     * 库点利润详情列表查询
      *
      * @param warehouseBaseInfo
      * @return

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

@@ -507,6 +507,16 @@ public class ContractManagementInfo extends BaseModel<ContractManagementInfo> {
      */
     @TableField(exist = false)
     private Double amountEdPayableNew;
+    /**
+     * 剩余(吨)
+     */
+    @TableField(exist = false)
+    private Double surplus;
+    /**
+     * 利润(万元)
+     */
+    @TableField(exist = false)
+    private Double profit;
     /**
      * 应收粮款
      */

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

@@ -3044,8 +3044,13 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             }
                         }
                     }
+
                     //常用库退库入库类型
                     else if ("退库".equals(warehouseInOutInfo.getInOutType())) {
+                        //检斤表
+                        WeighingManagement weighingManagement = weighingManagementService.selectOne(new EntityWrapper<WeighingManagement>()
+                                .eq("warehouse_in_out_id",warehouseInOutInfo.getId())
+                                .eq("delete_flag", "0"));
                         //他运的销售合同
                         ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
                                 .eq("contract_no", warehouseInOutInfo.getContractNo())
@@ -3064,9 +3069,9 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             stockSaleReceiptReport.setGrossWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getGrossWeight())));
                             stockSaleReceiptReport.setTare(Double.valueOf(String.valueOf(warehouseInOutInfo.getTare())));
                             stockSaleReceiptReport.setNetWeight(-warehouseInOutInfo.getNetWeight());
-                            stockSaleReceiptReport.setSettlementPrice(contractManagementInfo.getUnitContractPrice());
+                            stockSaleReceiptReport.setSettlementPrice(Double.valueOf(String.valueOf(weighingManagement.getContractPrice())));
                             stockSaleReceiptReport.setReturnDate(warehouseInOutInfo.getInOutDate());
-                            stockSaleReceiptReport.setAmountIngReceivable(-warehouseInOutInfo.getNetWeight() * contractManagementInfo.getUnitContractPrice());
+                            stockSaleReceiptReport.setAmountIngReceivable(-warehouseInOutInfo.getNetWeight() * (Double.valueOf(String.valueOf(weighingManagement.getContractPrice()))));
                             stockSaleReceiptReport.setSettlementWeight(-warehouseInOutInfo.getNetWeight());
                             stockSaleReceiptReport.setReturnFlag("1");
                             stockSaleReceiptReport.setStatusFlag(StatusEnum.TO_BE_RECEIVED.getFlag());
@@ -3102,7 +3107,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             stockSaleReceiptReport.setTare(Double.valueOf(String.valueOf(warehouseInOutInfo.getTare())));
                             stockSaleReceiptReport.setNetWeight(-warehouseInOutInfo.getNetWeight());
                             stockSaleReceiptReport.setReturnDate(warehouseInOutInfo.getInOutDate());
-                            stockSaleReceiptReport.setAmountIngReceivable(-warehouseInOutInfo.getNetWeight() * contractManagementInfo1.getUnitContractPrice());
+                            stockSaleReceiptReport.setAmountIngReceivable(-warehouseInOutInfo.getNetWeight() * (Double.valueOf(String.valueOf(weighingManagement.getContractPrice()))));
                             stockSaleReceiptReport.setSettlementWeight(-warehouseInOutInfo.getNetWeight());
                             stockSaleReceiptReport.setReturnFlag("1");
                             stockSaleReceiptReport.setStatusFlag(StatusEnum.TO_BE_RECEIVED.getFlag());
@@ -3373,6 +3378,10 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                 else if ("1".equals(warehouseInOutInfo.getInOutFlag()) && "1".equals(warehouseBaseInfo.getWarehouseType())) {
                     //常用库销售出库类型
                     if ("1".equals(warehouseInOutInfo.getInOutTypeKey())) {
+                        //检斤表
+                        WeighingManagement weighingManagement = weighingManagementService.selectOne(new EntityWrapper<WeighingManagement>()
+                                .eq("warehouse_in_out_id",warehouseInOutInfo.getId())
+                                .eq("delete_flag", "0"));
                         //他运的销售合同
                         ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
                                 .eq("contract_no", warehouseInOutInfo.getContractNo())
@@ -3465,14 +3474,14 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             if ("1".equals(contractManagementInfo.getSettlementWeightMethod())) {
                                 stockSaleReceiptReport.setSettlementWeight(warehouseInOutInfo.getNetWeight());
                             }
-                            //定价销售
-                            if (contractManagementInfo.getUnitContractPrice() != null) {
-                                stockSaleReceiptReport.setSettlementPrice(contractManagementInfo.getUnitContractPrice());
+//                            //定价销售
+//                            if (contractManagementInfo.getUnitContractPrice() != null) {
+                                stockSaleReceiptReport.setSettlementPrice(Double.valueOf(String.valueOf(weighingManagement.getContractPrice())));
                                 stockSaleReceiptReport.setAmountIngReceivable(warehouseInOutInfo.getNetWeight() *
-                                        (contractManagementInfo.getUnitContractPrice()));
+                                        (Double.valueOf(String.valueOf(weighingManagement.getContractPrice()))));
                                 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());
@@ -3569,14 +3578,14 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             //按出库重量结算时
                             if ("1".equals(contractManagementInfo1.getSettlementWeightMethod())) {
                                 stockSaleReceiptReport.setSettlementWeight(warehouseInOutInfo.getNetWeight());
-                                //定价销售
-                                if (contractManagementInfo1.getUnitContractPrice() != null) {
-                                    stockSaleReceiptReport.setSettlementPrice(contractManagementInfo1.getUnitContractPrice());
+//                                //定价销售
+//                                if (contractManagementInfo1.getUnitContractPrice() != null) {
+                                    stockSaleReceiptReport.setSettlementPrice(Double.valueOf(String.valueOf(weighingManagement.getContractPrice())));
                                     stockSaleReceiptReport.setAmountIngReceivable(warehouseInOutInfo.getNetWeight() *
-                                            (contractManagementInfo1.getUnitContractPrice()));
+                                            (Double.valueOf(String.valueOf(weighingManagement.getContractPrice()))));
                                     stockSaleReceiptReport.setAmountEdReceivable(0.00);
                                     stockSaleReceiptReport.setAmountNotReceivable(stockSaleReceiptReport.getAmountIngReceivable());
-                                }
+//                                }
                             }
                             stockSaleReceiptReport.setStatusFlag(StatusEnum.TO_BE_RECEIVED.getFlag());
                             stockSaleReceiptReport.setStatus(StatusEnum.TO_BE_RECEIVED.getName());
@@ -3797,6 +3806,10 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                 }
                 //临时库出库
                 else if ("1".equals(warehouseInOutInfo.getInOutFlag()) && "2".equals(warehouseBaseInfo.getWarehouseType())) {
+                    //检斤表
+                    WeighingManagement weighingManagement = weighingManagementService.selectOne(new EntityWrapper<WeighingManagement>()
+                            .eq("warehouse_in_out_id",warehouseInOutInfo.getId())
+                            .eq("delete_flag", "0"));
                     //临时库销售出库类型 且为自动创建的临时库时(采购报表进数据，销售报表也进数据)
                     if ("1".equals(warehouseInOutInfo.getInOutTypeKey()) && "1".equals(warehouseBaseInfo.getCreateType())) {
                         ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
@@ -3817,11 +3830,11 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             stockPurchaseReceiptReport.setNetWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                             stockPurchaseReceiptReport.setWarehousingDate(warehouseInOutInfo.getInOutDate());
                             stockPurchaseReceiptReport.setSettlementWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
-                            stockPurchaseReceiptReport.setSettlementPrice(contractManagementInfo.getUnitContractPrice());
-                            if (contractManagementInfo.getUnitContractPrice() != null) {
+                            stockPurchaseReceiptReport.setSettlementPrice(Double.valueOf(String.valueOf(weighingManagement.getContractPrice())));
+//                            if (contractManagementInfo.getUnitContractPrice() != null) {
                                 stockPurchaseReceiptReport.setAmountIngPayable(warehouseInOutInfo.getNetWeight() *
-                                        (contractManagementInfo.getUnitContractPrice()));
-                            }
+                                        (Double.valueOf(String.valueOf(weighingManagement.getContractPrice()))));
+//                            }
                             stockPurchaseReceiptReport.setAmountEdPayable(0.0d);
                             stockPurchaseReceiptReport.setAmountNotPayable(stockPurchaseReceiptReport.getAmountIngPayable());
                             stockPurchaseReceiptReport.setStatusFlag(StatusEnum.FORM_REVIEWED.getFlag());
@@ -3944,10 +3957,10 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             stockPurchaseReceiptReport.setNetWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
                             stockPurchaseReceiptReport.setWarehousingDate(warehouseInOutInfo.getInOutDate());
                             stockPurchaseReceiptReport.setSettlementWeight(Double.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
-                            stockPurchaseReceiptReport.setSettlementPrice(contractManagementInfo.getUnitContractPrice());
+                            stockPurchaseReceiptReport.setSettlementPrice(Double.valueOf(String.valueOf(weighingManagement.getContractPrice())));
                             if (contractManagementInfo.getUnitContractPrice() != null) {
                                 stockPurchaseReceiptReport.setAmountIngPayable(warehouseInOutInfo.getNetWeight() *
-                                        (contractManagementInfo.getUnitContractPrice()));
+                                        (Double.valueOf(String.valueOf(weighingManagement.getContractPrice()))));
                             }
                             stockPurchaseReceiptReport.setAmountEdPayable(0.0d);
                             stockPurchaseReceiptReport.setAmountNotPayable(stockPurchaseReceiptReport.getAmountIngPayable());

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WeighingManagementMapper.xml

@@ -51,6 +51,7 @@
         a.number,
         a.customer,
         a.warehouse_in_out_id as warehouseInOutId,
+        a.contract_price as contrantPrice,
         a.customer_number_card as customerNumberCard,
         a.service_management_type as serviceManagementType,
         a.customer_phone as customerPhone,