1

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

@@ -75,8 +75,8 @@ public class QualityInspectionManagementController {
      * @return
      */
     @GetMapping("/api/goodsName")
-    public List<PurchasePrice> goodsName(@RequestParam String warehouseId) {
-        return qualityInspectionManagementService.goodsName(warehouseId);
+    public List<PurchasePrice> goodsName(@RequestParam String warehouseId,String flag) {
+        return qualityInspectionManagementService.goodsName(warehouseId,flag);
     }
     /**
      * 出库管理添加质检管理信息

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

@@ -48,7 +48,7 @@ public interface IQualityInspectionManagementService extends IService<QualityIns
      * @param warehouseId
      * @return
      */
-    List<PurchasePrice> goodsName(String warehouseId);
+    List<PurchasePrice> goodsName(String warehouseId,String flag);
     /**
      * 出库管理添加质检管理信息
      * @param qualityInspectionManagement

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

@@ -523,6 +523,9 @@ public class IdentityAuthenticationInfoServiceImpl extends ServiceImpl<IdentityA
                 .eq("warehouse_id",identityAuthenticationInfo.getWarehouseId())
                 .eq("goods_name",identityAuthenticationInfo.getGoodsName())
                 .eq("status","已通过"));
+        if (purchasePrice==null){
+            throw new YException(YExceptionEnum.PURCHASE_PRICE_GOODSNAME_ERROR);
+        }
         if (identityAuthenticationInfo.getGoodsName().contains("玉米")) {
             identityAuthenticationInfo.setGoodsName("玉米");
         }

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

@@ -299,11 +299,10 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
             qualityInspectionManagement.setStatus(StatusEnum.FIRST_INSPECTED.getName());
             qualityInspectionManagement.setStatusFlag(StatusEnum.FIRST_INSPECTED.getFlag());
         }
-        if(qualityInspectionManagement.getCost() == null){
-            qualityInspectionManagement.setCost(Float.parseFloat((qualityInspectionManagement.getDryGrainPrice()==null?0:qualityInspectionManagement.getDryGrainPrice())*1000 + ""));
-        }
         boolean one=this.updateById(qualityInspectionManagement);
         QualityInspectionManagement qualityInspectionManagement1=this.selectById(qualityInspectionManagement.getId());
+        qualityInspectionManagement1.setCost(Float.parseFloat((qualityInspectionManagement1.getDryGrainPrice()==null?0:qualityInspectionManagement1.getDryGrainPrice())*1000 + ""));
+        this.updateById(qualityInspectionManagement1);
         PaymentManagement paymentManagement=paymentManagementService.selectOne(new EntityWrapper<PaymentManagement>()
                 .eq("relation_id",qualityInspectionManagement1.getRelationId())
                 .eq("status","待结算")
@@ -368,25 +367,34 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
      * @return
      */
     @Override
-    public List<PurchasePrice> goodsName(String warehouseId) {
-        //查潮粮单价已审核的数据
-        List<PurchasePrice> purchasePriceList=purchasePriceService.selectList(new EntityWrapper<PurchasePrice>()
-            .eq("warehouse_id",warehouseId)
-            .eq("status","已通过"));
-        if(CollectionUtils.isNotEmpty(purchasePriceList)){
-            for (PurchasePrice purchasePrice:purchasePriceList){
-                List<PurchasePriceDetailPrint> purchasePriceDetailPrints=purchasePriceDetailPrintService.selectList(new EntityWrapper<PurchasePriceDetailPrint>()
-                .eq("main_id",purchasePrice.getId()).orderBy("bulk_density_min"));
-                if (CollectionUtils.isNotEmpty(purchasePriceDetailPrints)){
-                    purchasePrice.setBulkDensityMin(purchasePriceDetailPrints.get(0).getBulkDensityMin());
-                }
+    public List<PurchasePrice> goodsName(String warehouseId,String flag) {
+        List<PurchasePrice> purchasePrices=new ArrayList<>();
+        if ("1".equals(flag)) {
+            List<PurchasePrice> purchasePriceList = purchasePriceService.selectList(new EntityWrapper<PurchasePrice>()
+                    .eq("warehouse_id", warehouseId));
+            if (CollectionUtils.isNotEmpty(purchasePriceList)) {
+                purchasePrices = purchasePriceList;
             }
-            return purchasePriceList;
         }
-        else{
-            throw new YException(YExceptionEnum.PURCHASE_PRICE_GOODSNAME_ERROR);
+        else {
+            //查潮粮单价已审核的数据
+            List<PurchasePrice> purchasePriceList = purchasePriceService.selectList(new EntityWrapper<PurchasePrice>()
+                    .eq("warehouse_id", warehouseId)
+                    .eq("status", "已通过"));
+            if (CollectionUtils.isNotEmpty(purchasePriceList)) {
+                for (PurchasePrice purchasePrice : purchasePriceList) {
+                    List<PurchasePriceDetailPrint> purchasePriceDetailPrints = purchasePriceDetailPrintService.selectList(new EntityWrapper<PurchasePriceDetailPrint>()
+                            .eq("main_id", purchasePrice.getId()).orderBy("bulk_density_min"));
+                    if (CollectionUtils.isNotEmpty(purchasePriceDetailPrints)) {
+                        purchasePrice.setBulkDensityMin(purchasePriceDetailPrints.get(0).getBulkDensityMin());
+                    }
+                }
+                purchasePrices = purchasePriceList;
+            } else {
+                throw new YException(YExceptionEnum.PURCHASE_PRICE_GOODSNAME_ERROR);
+            }
         }
-
+        return purchasePrices;
     }
 
     /**