1

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

@@ -99,12 +99,12 @@ public class PurchasePriceController {
 
     /**
      * 根据仓库名货名查仓库设置信息
-     * @param purchasePrice
+     * @param warehouseId,goodsName
      * @return
      */
     @GetMapping("/selectByName")
-    public PurchasePrice selectByName(@RequestBody PurchasePrice purchasePrice) {
-        return iPurchasePriceService.selectByName(purchasePrice);
+    public PurchasePrice selectByName(@RequestParam String warehouseId, String goodsName) {
+        return iPurchasePriceService.selectByName(warehouseId,goodsName);
     }
 }
 

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

@@ -67,10 +67,10 @@ public interface IPurchasePriceService extends IService<PurchasePrice> {
     Float dryGrainPrice(PurchasePrice purchasePrice);
     /**
      * 根据仓库名货名查仓库设置信息
-     * @param purchasePrice
+     * @param warehouseId,goodsName
      * @return
      */
-    PurchasePrice selectByName(PurchasePrice purchasePrice);
+    PurchasePrice selectByName(String warehouseId, String goodsName);
 
 
 }

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

@@ -352,11 +352,18 @@ public class PurchasePriceServiceImpl extends ServiceImpl<PurchasePriceMapper, P
     }
 
     @Override
-    public PurchasePrice selectByName(PurchasePrice purchasePrice) {
-        PurchasePrice purchasePrice1=this.selectOne(new EntityWrapper<PurchasePrice>()
-                .eq("warehouse_id",purchasePrice.getWarehouseId())
-                .eq("goods_name",purchasePrice.getGoodsName())
+    public PurchasePrice selectByName(String warehouseId, String goodsName) {
+        PurchasePrice purchasePrice1=new PurchasePrice();
+        PurchasePrice purchasePrice=this.selectOne(new EntityWrapper<PurchasePrice>()
+                .eq("warehouse_id",warehouseId)
+                .eq("goods_name",goodsName)
                 .eq("status_flag","3"));
+        if (purchasePrice!=null){
+            purchasePrice1=purchasePrice;
+        }
+        else {
+            purchasePrice1.setDeductWeight(1.3f);
+        }
         return purchasePrice1;
     }
 }