1

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

@@ -86,6 +86,7 @@ public class PurchasePriceController {
         return iPurchasePriceService.tidalGrainPrice(purchasePrice);
     }
 
+
     /**
      * 查干粮单价
      * @param purchasePrice

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

@@ -62,6 +62,10 @@ public class PurchasePrice extends BaseModel<PurchasePrice> {
      * 货名
      */
     private String goodsName;
+    /**
+     * 以容重为标准（1是）
+     */
+    private String bulkDensityStandard;
     /**
      * 干粮收购价
      */
@@ -111,7 +115,6 @@ public class PurchasePrice extends BaseModel<PurchasePrice> {
     /**
      * 通过时间
      */
-
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date passDate;
@@ -123,6 +126,11 @@ public class PurchasePrice extends BaseModel<PurchasePrice> {
      */
     @TableField(exist = false)
     private Float waterContent;
+    /**
+     * 容重
+     */
+    @TableField(exist = false)
+    private Float bulkDensity;
     /**
      * 等级
      */

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

@@ -64,6 +64,18 @@ public class PurchasePriceDetailPrint extends BaseModel<PurchasePriceDetailPrint
      * 等外单价
      */
     private Float priceOther;
+    /**
+     * 容重下限
+     */
+    private Float bulkDensityMin;
+    /**
+     * 容重上限
+     */
+    private Float bulkDensityMax;
+    /**
+     * 容重单价
+     */
+    private Float bulkDensityPrice;
 
 
     @Override

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

@@ -13,4 +13,6 @@ public class TmpModel {
     String startWater;
     String endWater;
     String price;
+    String startBulkDensity;
+    String endBulkDensity;
 }

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

@@ -184,8 +184,13 @@ public class PurchasePriceServiceImpl extends ServiceImpl<PurchasePriceMapper, P
             List<TmpModel> list = new ArrayList<>();
            for(int i=0;i<points.length - 1;i++){
                TmpModel tmpModel = new TmpModel();
-               tmpModel.setStartWater(points[i]);
-               tmpModel.setEndWater(points[i+1]);
+               if("1".equals(purchasePrice.getBulkDensityStandard())){
+                   tmpModel.setStartBulkDensity(points[i]);
+                   tmpModel.setEndBulkDensity(points[i+1]);
+               }else {
+                   tmpModel.setStartWater(points[i]);
+                   tmpModel.setEndWater(points[i+1]);
+               }
                if(i<pointPrices.length){
                    tmpModel.setPrice(pointPrices[i]);
                }
@@ -247,11 +252,9 @@ public class PurchasePriceServiceImpl extends ServiceImpl<PurchasePriceMapper, P
             }
             // 退回的单子 再启用
             else {
-
                 this.updateById(purchasePrice);
                 workflowService.activateInstance(purchasePrice.getWorkflowId(), purchasePrice.getId());
             }
-//        }
         return "ok";
     }
 
@@ -283,7 +286,7 @@ public class PurchasePriceServiceImpl extends ServiceImpl<PurchasePriceMapper, P
     }
 
     /**
-     * 查潮粮单价
+     * 根据水分/容重查潮粮单价
      * @param purchasePrice
      * @return
      */
@@ -295,28 +298,41 @@ public class PurchasePriceServiceImpl extends ServiceImpl<PurchasePriceMapper, P
         .eq("goods_name",purchasePrice.getGoodsName())
         .eq("status_flag","3"));
         if (purchasePrice1!=null){
-            PurchasePriceDetailPrint purchasePriceDetailPrint=purchasePriceDetailPrintService.selectOne(new EntityWrapper<PurchasePriceDetailPrint>()
-            .eq("main_id",purchasePrice1.getId())
-            .le("water_min",purchasePrice.getWaterContent())
-            .ge("water_max",purchasePrice.getWaterContent()));
-            if (purchasePriceDetailPrint!=null){
-                if ("一等品".equals(purchasePrice.getGrade())){
-                    tidalGrainPrice=purchasePriceDetailPrint.getPrice1();
-                }
-                else if ("二等品".equals(purchasePrice.getGrade())){
-                    tidalGrainPrice=purchasePriceDetailPrint.getPrice2();
+            if ("1".equals(purchasePrice1.getBulkDensityStandard())){
+                //根据容重查单价
+                PurchasePriceDetailPrint purchasePriceDetailPrint=purchasePriceDetailPrintService.selectOne(new EntityWrapper<PurchasePriceDetailPrint>()
+                        .eq("main_id",purchasePrice1.getId())
+                        .le("bulk_density_min",purchasePrice.getBulkDensity())
+                        .ge("bulk_density_max",purchasePrice.getBulkDensity()));
+                if (purchasePriceDetailPrint!=null){
+                    tidalGrainPrice=purchasePriceDetailPrint.getBulkDensityPrice();
                 }
-                else if ("三等品".equals(purchasePrice.getGrade())){
-                    tidalGrainPrice=purchasePriceDetailPrint.getPrice3();
-                }
-                else{
-                    tidalGrainPrice=purchasePriceDetailPrint.getPriceOther();
+            }else {
+                //根据水分查单价
+                PurchasePriceDetailPrint purchasePriceDetailPrint=purchasePriceDetailPrintService.selectOne(new EntityWrapper<PurchasePriceDetailPrint>()
+                        .eq("main_id",purchasePrice1.getId())
+                        .le("water_min",purchasePrice.getWaterContent())
+                        .ge("water_max",purchasePrice.getWaterContent()));
+                if (purchasePriceDetailPrint!=null){
+                    if ("一等品".equals(purchasePrice.getGrade())){
+                        tidalGrainPrice=purchasePriceDetailPrint.getPrice1();
+                    }
+                    else if ("二等品".equals(purchasePrice.getGrade())){
+                        tidalGrainPrice=purchasePriceDetailPrint.getPrice2();
+                    }
+                    else if ("三等品".equals(purchasePrice.getGrade())){
+                        tidalGrainPrice=purchasePriceDetailPrint.getPrice3();
+                    }
+                    else{
+                        tidalGrainPrice=purchasePriceDetailPrint.getPriceOther();
+                    }
                 }
             }
         }
         return tidalGrainPrice;
     }
 
+
     @Override
     public Float dryGrainPrice(PurchasePrice purchasePrice) {
         Float dryGrainPrice=0.0f;