1

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

@@ -86,5 +86,14 @@ public class PurchasePriceController {
         return iPurchasePriceService.tidalGrainPrice(purchasePrice);
     }
 
+    /**
+     * 查干粮单价
+     * @param purchasePrice
+     * @return
+     */
+    @GetMapping("/dryGrainPrice")
+    public Float dryGrainPrice(PurchasePrice purchasePrice) {
+        return iPurchasePriceService.dryGrainPrice(purchasePrice);
+    }
 }
 

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

@@ -59,6 +59,12 @@ public interface IPurchasePriceService extends IService<PurchasePrice> {
      * @return
      */
     Float tidalGrainPrice(PurchasePrice purchasePrice);
+    /**
+     * 查干粮单价
+     * @param purchasePrice
+     * @return
+     */
+    Float dryGrainPrice(PurchasePrice purchasePrice);
 
 
 }

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

@@ -264,4 +264,17 @@ public class PurchasePriceServiceImpl extends ServiceImpl<PurchasePriceMapper, P
         return tidalGrainPrice;
     }
 
+    @Override
+    public Float dryGrainPrice(PurchasePrice purchasePrice) {
+        Float dryGrainPrice=0.0f;
+        PurchasePrice purchasePrice1=this.selectOne(new EntityWrapper<PurchasePrice>()
+                .eq("warehouse_id",purchasePrice.getWarehouseId())
+                .eq("goods_name",purchasePrice.getGoodsName())
+                .eq("status_flag","3"));
+        if (purchasePrice1!=null){
+            dryGrainPrice=purchasePrice1.getDryGrainPrice();
+        }
+        return dryGrainPrice;
+    }
+
 }

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

@@ -39,6 +39,7 @@
         bin_number as binNumber,
         storage_number as storageNumber,
         secretary_weigher as secretaryWeigher,
+        buckle_miscellaneous as buckleMiscellaneous,
         skin_inspector as skinInspector,
         gross_date as grossDate,
         tare_date as tareDate,