1.查累积量，2皮重检斤时计算纯重

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

@@ -3,6 +3,7 @@ package com.yh.saas.plugin.yiliangyiyun.controller;
 
 import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.plugin.yiliangyiyun.entity.PaymentManagement;
+import com.yh.saas.plugin.yiliangyiyun.entity.PurchasePrice;
 import com.yh.saas.plugin.yiliangyiyun.service.IPaymentManagementService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -62,6 +63,15 @@ public class PaymentManagementController {
     public void deleteInfo(@RequestBody PaymentManagement paymentManagement){
         paymentManagementService.deleteInfo(paymentManagement.getId());
     }
+    /**
+     * 查累积量
+     * @param paymentManagement
+     * @return
+     */
+    @GetMapping("/cumulant")
+    public Float cumulant(PaymentManagement paymentManagement) {
+        return paymentManagementService.cumulant(paymentManagement);
+    }
 
 }
 

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

@@ -41,4 +41,10 @@ public interface IPaymentManagementService extends IService<PaymentManagement> {
      * @param id
      */
     void deleteInfo(String id);
+    /**
+     * 查客户对应货名当年累积量
+     * @param paymentManagement
+     * @return
+     */
+    Float cumulant(PaymentManagement paymentManagement);
 }

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

@@ -7,15 +7,9 @@ import com.winsea.svc.base.base.entity.CommonCompany;
 import com.winsea.svc.base.base.service.ICommonCompanyService;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
-import com.yh.saas.plugin.yiliangyiyun.entity.PaymentManagement;
-import com.yh.saas.plugin.yiliangyiyun.entity.QualityInspectionManagement;
-import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseBaseInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.WeighingManagement;
+import com.yh.saas.plugin.yiliangyiyun.entity.*;
 import com.yh.saas.plugin.yiliangyiyun.mapper.WeighingManagementMapper;
-import com.yh.saas.plugin.yiliangyiyun.service.IPaymentManagementService;
-import com.yh.saas.plugin.yiliangyiyun.service.IQualityInspectionManagementService;
-import com.yh.saas.plugin.yiliangyiyun.service.IWarehouseBaseInfoService;
-import com.yh.saas.plugin.yiliangyiyun.service.IWeighingManagementService;
+import com.yh.saas.plugin.yiliangyiyun.service.*;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,6 +39,8 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
     private ICommonCompanyService commonCompanyService;
     @Autowired
     private IWarehouseBaseInfoService warehouseBaseInfoService;
+    @Autowired
+    private IPurchasePriceService purchasePriceService;
     /**
      * 检斤管理列表
      * @param weighingManagement
@@ -157,6 +153,16 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
             paymentManagement1.setCarNo(weighingManagement1.getCarNumber());
             paymentManagement1.setType(weighingManagement1.getType());
             paymentManagement1.setGoodsName(weighingManagement1.getGoodsName());
+            if ("潮粮".equals(weighingManagement1.getType())){
+                //查收购设置数据
+                PurchasePrice purchasePrice=purchasePriceService.selectOne(new EntityWrapper<PurchasePrice>()
+                        .eq("warehouse_id",weighingManagement.getWarehouseId())
+                .eq("goods_name",weighingManagement.getGoodsName()));
+                Float pureWeight=weighingManagement1.getNetWeight()* (100-(Float.valueOf(qualityInspectionManagement1.getWaterContent())-purchasePrice.getWaterMin())*purchasePrice.getDeductWeight())/100;
+                paymentManagement1.setPureWeight(pureWeight);
+            }
+            paymentManagement1.setStatus(StatusEnum.TO_BE_SETTLED.getName());
+            paymentManagement1.setStatusFlag(StatusEnum.TO_BE_SETTLED.getFlag());
             paymentManagement1.setNetWeight(weighingManagement1.getNetWeight());
             paymentManagement1.setWarehouseName(weighingManagement1.getWarehouseName());
             //质检信息