更新

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

@@ -323,6 +323,12 @@ public class PaymentManagement extends BaseModel<PaymentManagement> {
     @TableField(exist = false)
     private String qualityInspectionPictureAddress;
 
+    /**
+     * 纯重计算参数
+     */
+    @TableField(exist = false)
+    private Float param;
+
     @Override
     protected Serializable pkVal() {
         return this.id;

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

@@ -3,6 +3,7 @@ package com.yh.saas.plugin.yiliangyiyun.entity;
 import java.util.Date;
 import com.baomidou.mybatisplus.activerecord.Model;
 import java.io.Serializable;
+import java.util.List;
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
@@ -99,7 +100,7 @@ public class QualityInspectionManagement extends BaseModel<QualityInspectionMana
      */
     private String paramType;
     /**
-     * 扣杂 
+     * 扣杂
      */
     private Float buckleMiscellaneous;
     /**
@@ -214,7 +215,17 @@ public class QualityInspectionManagement extends BaseModel<QualityInspectionMana
      */
     @TableField(exist = false)
     private String personPhone;
+    @TableField(exist = false)
+    /**
+     * 干粮水分
+     */
+    private Float waterMin;
 
+    @TableField(exist = false)
+    /**
+     * 干粮水分
+     */
+    private List<PurchasePrice> purchasePriceList;
 
     @Override
     protected Serializable pkVal() {

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

@@ -75,6 +75,10 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
     private ICostManagementInfoService costManagementInfoService;
     @Autowired
     private ICommonSysParameterService iCommonSysParameterService;
+    @Autowired
+    private IPurchasePriceDetailService purchasePriceDetailService;
+    @Autowired
+    private IPurchasePriceService purchasePriceService;
     /**
      * 付款管理列表
      * @param paymentManagement
@@ -171,6 +175,35 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
             paymentManagement.setCompName(commonCompany.getCompName());
             paymentManagement.setTaxRegistrationNo(commonCompany.getCompImo());
         }
+        PurchasePrice purchasePrice=purchasePriceService.selectOne(new EntityWrapper<PurchasePrice>()
+                .eq("warehouse_id",qualityInspectionManagement.getWarehouseId())
+                .eq("goods_name",qualityInspectionManagement.getGoodsName())
+                .eq("status_flag","3"));
+        if (purchasePrice!=null){
+            if(purchasePrice.getParamType().equals("1")){
+                PurchasePriceDetail purchasePriceDetail = purchasePriceDetailService.selectOne(new EntityWrapper<PurchasePriceDetail>()
+                        .eq("main_id",purchasePrice.getId())
+                        .like("level",qualityInspectionManagement.getGrade().replace("品",""))
+                        .eq("delete_flag","0"));
+                String[] point = purchasePriceDetail.getPoint().split(",");
+                String[] pointPrice = purchasePriceDetail.getPointPrice().split(",");
+                Float param = 0f;
+                for(int i=0;i<point.length - 1;i++){
+                    if(Float.parseFloat(qualityInspectionManagement.getWaterContent()) >= Float.parseFloat(point[i])
+                            &&Float.parseFloat(qualityInspectionManagement.getWaterContent()) < Float.parseFloat(point[i+1])){
+                        param +=  (Float.parseFloat(qualityInspectionManagement.getWaterContent()) - Float.parseFloat(point[i]))*Float.parseFloat(pointPrice[i]);
+                        break;
+                    }
+                    else{
+                        param +=  (Float.parseFloat(point[i+1]) - Float.parseFloat(point[i]))*Float.parseFloat(pointPrice[i]);
+                    }
+                }
+                paymentManagement.setParam(param);
+            }
+            else{
+                qualityInspectionManagement.setWaterMin(purchasePrice.getWaterMin());
+            }
+        }
         IdentityAuthenticationInfo identityAuthenticationInfo=iIdentityAuthenticationInfoService.selectOne(new EntityWrapper<IdentityAuthenticationInfo>()
         .eq("customer_name",paymentManagement.getCustomerName()).eq("cover","0")
         .eq("customer_type_flag","1"));

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

@@ -119,6 +119,10 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
                 qualityInspectionManagement.setPerson(warehouseBaseInfo.getPersonCharge());
                 qualityInspectionManagement.setPersonPhone(warehouseBaseInfo.getPersonPhone());
             }
+            List<PurchasePrice> list=purchasePriceService.selectList(new EntityWrapper<PurchasePrice>()
+                    .eq("warehouse_id",qualityInspectionManagement.getWarehouseId())
+                    .eq("status_flag","3"));
+            qualityInspectionManagement.setPurchasePriceList(list);
         }
         return qualityInspectionManagement;
     }

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

@@ -1012,12 +1012,12 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         if (!CollectionUtils.isEmpty(warehouseBaseInfoList)){
             for (WarehouseBaseInfo warehouseBaseInfo:warehouseBaseInfoList) {
                 //查潮粮单价已审核的数据
-                List<PurchasePrice> purchasePriceList=purchasePriceService.selectList(new EntityWrapper<PurchasePrice>()
-                        .eq("warehouse_id",warehouseBaseInfo.getId())
-                        .eq("status_flag","3"));
-                if (!CollectionUtils.isEmpty(purchasePriceList)){
-                    warehouseBaseInfo.setPurchasePriceList(purchasePriceList);
-                }
+//                List<PurchasePrice> purchasePriceList=purchasePriceService.selectList(new EntityWrapper<PurchasePrice>()
+//                        .eq("warehouse_id",warehouseBaseInfo.getId())
+//                        .eq("status_flag","3"));
+//                if (!CollectionUtils.isEmpty(purchasePriceList)){
+//                    warehouseBaseInfo.setPurchasePriceList(purchasePriceList);
+//                }
                 Map<String, Object> pageView = new HashMap<>();
                 pageView.put("warehouseName", warehouseBaseInfo.getWarehouseName());
                 pageView.put("compId", warehouseBaseInfo.getCompId());
@@ -1042,12 +1042,12 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                     for (WarehouseBaseInfo warehouseBaseInfo:warehouseBaseInfoList1){
                         warehouseBaseInfo.setFlag("全部");
                         //查潮粮单价已审核的数据
-                        List<PurchasePrice> purchasePriceList=purchasePriceService.selectList(new EntityWrapper<PurchasePrice>()
-                                .eq("warehouse_id",warehouseBaseInfo.getId())
-                                .eq("status_flag","3"));
-                        if (!CollectionUtils.isEmpty(purchasePriceList)){
-                            warehouseBaseInfo.setPurchasePriceList(purchasePriceList);
-                        }
+//                        List<PurchasePrice> purchasePriceList=purchasePriceService.selectList(new EntityWrapper<PurchasePrice>()
+//                                .eq("warehouse_id",warehouseBaseInfo.getId())
+//                                .eq("status_flag","3"));
+//                        if (!CollectionUtils.isEmpty(purchasePriceList)){
+//                            warehouseBaseInfo.setPurchasePriceList(purchasePriceList);
+//                        }
                         Map<String, Object> pageView = new HashMap<>();
                         pageView.put("warehouseName", warehouseBaseInfo.getWarehouseName());
                         pageView.put("compId", warehouseBaseInfo.getCompId());
@@ -1061,29 +1061,29 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 }
             }
         }
-        if (!CollectionUtils.isEmpty(warehouseBaseInfoList)) {
-            for (WarehouseBaseInfo warehouseBaseInfo : warehouseBaseInfoList) {
-                List<WarehousePositionStorageInfo> temp = new ArrayList();
-                // 以库位为维度查询
-                List<WarehousePositionInfo> warehousePositionInfos = warehousePositionInfoService.selectList(new EntityWrapper<WarehousePositionInfo>()
-                        .eq("base_id", warehouseBaseInfo.getId()));
-                if (!CollectionUtils.isEmpty(warehousePositionInfos)) {
-                    for (WarehousePositionInfo warehousePositionInfo:warehousePositionInfos) {
-                        //查询仓库内的货名
-                        List<WarehousePositionStorageInfo> warehousePositionStorageInfos = warehousePositionStorageInfoService.selectList(new EntityWrapper<WarehousePositionStorageInfo>()
-                                .eq("position_id", warehousePositionInfo.getId()));
-                        if (!CollectionUtils.isEmpty(warehousePositionStorageInfos)){
-                            for (WarehousePositionStorageInfo warehousePositionStorageInfo:warehousePositionStorageInfos){
-                                temp.add(warehousePositionStorageInfo);
-                            }
-                        }
-                    }
-                    warehouseBaseInfo.setGoodsNameInfos(temp);
-                    warehouseBaseInfo.setPositionInfos(warehousePositionInfos);
-                }
-            }
-
-        }
+//        if (!CollectionUtils.isEmpty(warehouseBaseInfoList)) {
+//            for (WarehouseBaseInfo warehouseBaseInfo : warehouseBaseInfoList) {
+//                List<WarehousePositionStorageInfo> temp = new ArrayList();
+//                // 以库位为维度查询
+//                List<WarehousePositionInfo> warehousePositionInfos = warehousePositionInfoService.selectList(new EntityWrapper<WarehousePositionInfo>()
+//                        .eq("base_id", warehouseBaseInfo.getId()));
+//                if (!CollectionUtils.isEmpty(warehousePositionInfos)) {
+//                    for (WarehousePositionInfo warehousePositionInfo:warehousePositionInfos) {
+//                        //查询仓库内的货名
+//                        List<WarehousePositionStorageInfo> warehousePositionStorageInfos = warehousePositionStorageInfoService.selectList(new EntityWrapper<WarehousePositionStorageInfo>()
+//                                .eq("position_id", warehousePositionInfo.getId()));
+//                        if (!CollectionUtils.isEmpty(warehousePositionStorageInfos)){
+//                            for (WarehousePositionStorageInfo warehousePositionStorageInfo:warehousePositionStorageInfos){
+//                                temp.add(warehousePositionStorageInfo);
+//                            }
+//                        }
+//                    }
+//                    warehouseBaseInfo.setGoodsNameInfos(temp);
+//                    warehouseBaseInfo.setPositionInfos(warehousePositionInfos);
+//                }
+//            }
+//
+//        }
         return warehouseBaseInfoList;
     }