1.质检货名下拉，2仓库设置校验3.自采客户下拉列表4，查潮粮单价

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

@@ -17,6 +17,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 
 /**
  * <p>
@@ -185,5 +187,15 @@ public class IdentityAuthenticationInfoController {
     public void deleteCompanyIdentity(@RequestBody IdentityAuthenticationInfo identityAuthenticationInfo) {
         iIdentityAuthenticationInfoService.deleteCompanyIdentity(identityAuthenticationInfo);
     }
+
+    /**
+     * 自采客户下拉列表
+     * @param identityAuthenticationInfo
+     * @return
+     */
+    @GetMapping("/identityAuthenticationInfoCustomer")
+    public List<IdentityAuthenticationInfo> identityAuthenticationInfoCustomer(IdentityAuthenticationInfo identityAuthenticationInfo) {
+        return iIdentityAuthenticationInfoService.identityAuthenticationInfoCustomer(identityAuthenticationInfo);
+    }
 }
 

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

@@ -76,5 +76,15 @@ public class PurchasePriceController {
     public String purchasePriceAllowEdit(PurchasePrice purchasePrice) {
         return iPurchasePriceService.purchasePriceAllowEdit(purchasePrice);
     }
+    /**
+     * 查潮粮单价
+     * @param purchasePrice
+     * @return
+     */
+    @GetMapping("/tidalGrainPrice")
+    public Float tidalGrainPrice(PurchasePrice purchasePrice) {
+        return iPurchasePriceService.tidalGrainPrice(purchasePrice);
+    }
+
 }
 

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

@@ -2,11 +2,14 @@ package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
 import com.baomidou.mybatisplus.plugins.Page;
+import com.yh.saas.plugin.yiliangyiyun.entity.PurchasePrice;
 import com.yh.saas.plugin.yiliangyiyun.entity.QualityInspectionManagement;
 import com.yh.saas.plugin.yiliangyiyun.service.IQualityInspectionManagementService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * <p>
  * 记录质检管理数据信息 前端控制器
@@ -40,12 +43,12 @@ public class QualityInspectionManagementController {
     }
     /**
      * 查看质检管理信息
-     *  @param qualityInspectionManagement
+     *  @param id
      * @return
      */
     @GetMapping("/api/getQualityInspection")
-    public QualityInspectionManagement getQualityInspection(@RequestBody QualityInspectionManagement qualityInspectionManagement) {
-         return qualityInspectionManagementService.getQualityInspection(qualityInspectionManagement.getId());
+    public QualityInspectionManagement getQualityInspection(@RequestParam String id) {
+         return qualityInspectionManagementService.getQualityInspection(id);
     }
     /**
      * 添加质检管理信息
@@ -63,7 +66,16 @@ public class QualityInspectionManagementController {
      */
     @PostMapping("/api/editQualityInspection")
     public String editQualityInspection(@RequestBody QualityInspectionManagement qualityInspectionManagement) {
-        return qualityInspectionManagementService.addQualityInspection(qualityInspectionManagement);
+        return qualityInspectionManagementService.editQualityInspection(qualityInspectionManagement);
+    }
+    /**
+     * 货名下拉列表
+     *  @param warehouseId
+     * @return
+     */
+    @GetMapping("/api/goodsName")
+    public List<PurchasePrice> goodsName(@RequestParam String warehouseId) {
+        return qualityInspectionManagementService.goodsName(warehouseId);
     }
 
 }

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

@@ -110,6 +110,16 @@ public class PurchasePrice extends BaseModel<PurchasePrice> {
 
     @TableField(exist = false)
     private String taskId;
+    /**
+     * 水分
+     */
+    @TableField(exist = false)
+    private String waterContent;
+    /**
+     * 等级
+     */
+    @TableField(exist = false)
+    private String grade;
     @Override
     protected Serializable pkVal() {
         return this.id;

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

@@ -158,6 +158,11 @@ public class QualityInspectionManagement extends BaseModel<QualityInspectionMana
      */
     @TableField(exist = false)
     private String searchKeyWord;
+    /**
+     * 仓库id
+     */
+    @TableField(exist = false)
+    private String warehouseId;
 
 
     @Override

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/exception/YExceptionEnum.java

@@ -30,6 +30,7 @@ public enum YExceptionEnum {
 	AUTHENTICATION_INFORMATION_CHANGE_FAILED("ERROR","身份认证状态审核中或已通过审核，无法更改身份认证信息"),
 	PURCHASE_ORDER_ERROR("PURCHASE-001", "审核没有可以进行的工作流！"),
 	PURCHASE_ORDER_ERROR1("PURCHASE-002", "客户未确认卸货不可结转！"),
+	PURCHASE_PRICE_ERROR("PURCHASE-003", "每种粮食只能设置一次！"),
 	;
 	@Getter
 	private String value;

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

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.service.IService;
 import com.yh.saas.plugin.yiliangyiyun.exception.AppServiceException;
 import com.yh.saas.plugin.yiliangyiyun.exception.ServiceException;
 
+import java.util.List;
+
 /**
  * <p>
  * 记录身份认证 服务类
@@ -101,4 +103,11 @@ public interface IIdentityAuthenticationInfoService extends IService<IdentityAut
      * @param identityAuthenticationInfo
      */
     void deleteCompanyIdentity(IdentityAuthenticationInfo identityAuthenticationInfo);
+    /**
+     *
+     * 自采客户下拉列表
+     * @param identityAuthenticationInfo
+     */
+    List<IdentityAuthenticationInfo> identityAuthenticationInfoCustomer(IdentityAuthenticationInfo identityAuthenticationInfo);
+
 }

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

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.service.IService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import java.util.List;
+
 /**
  * <p>
  * 库内自采价格主表 服务类
@@ -51,4 +53,12 @@ public interface IPurchasePriceService extends IService<PurchasePrice> {
      * @return
      */
     String purchasePriceAllowEdit(PurchasePrice purchasePrice);
+    /**
+     * 查潮粮单价
+     * @param purchasePrice
+     * @return
+     */
+    Float tidalGrainPrice(PurchasePrice purchasePrice);
+
+
 }

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

@@ -1,9 +1,12 @@
 package com.yh.saas.plugin.yiliangyiyun.service;
 
 import com.baomidou.mybatisplus.plugins.Page;
+import com.yh.saas.plugin.yiliangyiyun.entity.PurchasePrice;
 import com.yh.saas.plugin.yiliangyiyun.entity.QualityInspectionManagement;
 import com.baomidou.mybatisplus.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 记录质检管理数据信息 服务类
@@ -39,4 +42,10 @@ public interface IQualityInspectionManagementService extends IService<QualityIns
      * @param qualityInspectionManagement
      */
     String editQualityInspection(QualityInspectionManagement qualityInspectionManagement);
+    /**
+     * 货名下拉列表
+     * @param warehouseId
+     * @return
+     */
+    List<PurchasePrice> goodsName(String warehouseId);
 }

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

@@ -434,5 +434,18 @@ public class IdentityAuthenticationInfoServiceImpl extends ServiceImpl<IdentityA
         }
     }
 
+    /**
+     * 自采客户下拉列表
+     * @param identityAuthenticationInfo
+     * @return
+     */
+    @Override
+    public List<IdentityAuthenticationInfo> identityAuthenticationInfoCustomer(IdentityAuthenticationInfo identityAuthenticationInfo) {
+        Map<String, Object> pageView = new HashMap<>();
+        //公司id
+        pageView.put("compId", identityAuthenticationInfo.getCompId());
+        List<IdentityAuthenticationInfo> dataList = this.baseMapper.getIdentityInfoByCondition(pageView);
+        return dataList;
+    }
 }
 

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

@@ -83,33 +83,41 @@ public class PurchasePriceServiceImpl extends ServiceImpl<PurchasePriceMapper, P
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String purchasePriceAdd(PurchasePrice purchasePrice) {
-        try{
-            String compId = purchasePrice.getCompId();
-            String mainId = IdGenerator.generateUUID();
-            purchasePrice.setId(mainId);
-            purchasePrice.setStatus(StatusEnum.PURCHASE_REVIEWED.getName());
-            purchasePrice.setStatusFlag(StatusEnum.PURCHASE_REVIEWED.getFlag());
-            // 操作主表数据
-            this.insert(purchasePrice);
-
-            // 操作明细表数据
-            for(PurchasePriceDetail tmp : purchasePrice.getDetails()){
-                tmp.setId(IdGenerator.generateUUID());
-                tmp.setCompId(compId);
-                tmp.setMainId(mainId);
-                this.purchasePriceDetailService.insert(tmp);
-            }
-            // 操作打印表数据
-            for(PurchasePriceDetailPrint tmp : purchasePrice.getDetailPrints()){
-                tmp.setId(IdGenerator.generateUUID());
-                tmp.setCompId(compId);
-                tmp.setMainId(mainId);
-                this.purchasePriceDetailPrintService.insert(tmp);
-            }
-            return "ok";
+        //查同一仓库同一货名是否已设置
+        List<PurchasePrice> purchasePriceList=this.selectList(new EntityWrapper<PurchasePrice>()
+                .eq("warehouse_id",purchasePrice.getWarehouseId())
+                .eq("goods_name",purchasePrice.getGoodsName()));
+        if (!CollectionUtils.isEmpty(purchasePriceList)){
+            throw new YException(YExceptionEnum.PURCHASE_PRICE_ERROR);
         }
-        catch (Exception e){
-            System.out.println("新增收购价格异常："+e.toString());
+        else {
+            try {
+                String compId = purchasePrice.getCompId();
+                String mainId = IdGenerator.generateUUID();
+                purchasePrice.setId(mainId);
+                purchasePrice.setStatus(StatusEnum.PURCHASE_REVIEWED.getName());
+                purchasePrice.setStatusFlag(StatusEnum.PURCHASE_REVIEWED.getFlag());
+                // 操作主表数据
+                this.insert(purchasePrice);
+
+                // 操作明细表数据
+                for (PurchasePriceDetail tmp : purchasePrice.getDetails()) {
+                    tmp.setId(IdGenerator.generateUUID());
+                    tmp.setCompId(compId);
+                    tmp.setMainId(mainId);
+                    this.purchasePriceDetailService.insert(tmp);
+                }
+                // 操作打印表数据
+                for (PurchasePriceDetailPrint tmp : purchasePrice.getDetailPrints()) {
+                    tmp.setId(IdGenerator.generateUUID());
+                    tmp.setCompId(compId);
+                    tmp.setMainId(mainId);
+                    this.purchasePriceDetailPrintService.insert(tmp);
+                }
+                return "ok";
+            } catch (Exception e) {
+                System.out.println("新增收购价格异常：" + e.toString());
+            }
         }
         boolean isStartWorkflow = StringUtils.isBlank(purchasePrice.getWorkflowId());
         // 不是退回的单子
@@ -211,4 +219,40 @@ public class PurchasePriceServiceImpl extends ServiceImpl<PurchasePriceMapper, P
         this.warehouseBaseInfoService.updateById(warehouseBaseInfo);
         return "ok";
     }
+
+    /**
+     * 查潮粮单价
+     * @param purchasePrice
+     * @return
+     */
+    @Override
+    public Float tidalGrainPrice(PurchasePrice purchasePrice) {
+        Float tidalGrainPrice=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){
+            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 ("三等品".equals(purchasePrice.getGrade())){
+                    tidalGrainPrice=purchasePriceDetailPrint.getPrice3();
+                }
+                if ("等外".equals(purchasePrice.getGrade())){
+                    tidalGrainPrice=purchasePriceDetailPrint.getPriceOther();
+                }
+            }
+        }
+        return tidalGrainPrice;
+    }
+
 }

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

@@ -1,11 +1,14 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.google.common.collect.Lists;
 import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.yiliangyiyun.entity.PurchasePrice;
 import com.yh.saas.plugin.yiliangyiyun.entity.QualityInspectionManagement;
 import com.yh.saas.plugin.yiliangyiyun.entity.WeighingManagement;
 import com.yh.saas.plugin.yiliangyiyun.mapper.QualityInspectionManagementMapper;
+import com.yh.saas.plugin.yiliangyiyun.service.IPurchasePriceService;
 import com.yh.saas.plugin.yiliangyiyun.service.IQualityInspectionManagementService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.yh.saas.plugin.yiliangyiyun.service.IWeighingManagementService;
@@ -28,6 +31,8 @@ import java.util.Map;
 public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityInspectionManagementMapper, QualityInspectionManagement> implements IQualityInspectionManagementService {
     @Autowired
     private IWeighingManagementService weighingManagementService;
+    @Autowired
+    private IPurchasePriceService purchasePriceService;
     /**
      * 质检管理列表
      * @param qualityInspectionManagement
@@ -93,6 +98,21 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
             return "NG";
         }
     }
+
+    /**
+     * 查货名下拉列表
+     * @param warehouseId
+     * @return
+     */
+    @Override
+    public List<PurchasePrice> goodsName(String warehouseId) {
+        //查潮粮单价已审核的数据
+        List<PurchasePrice> purchasePriceList=purchasePriceService.selectList(new EntityWrapper<PurchasePrice>()
+        .eq("warehouse_id",warehouseId)
+        .eq("status_flag","3"));
+        return purchasePriceList;
+    }
+
     /**
      * 添加质检管理信息
      * @param qualityInspectionManagement

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

@@ -301,6 +301,7 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                           for (TranCarInfo tranCarInfo1:tranCarInfos){
                               tranCarInfo1.setShipName(tranCarInfo.getShipName());
                               tranCarInfo1.setShipNo(tranCarInfo.getShipNo());
+                              tranCarInfo1.setSendDateStart(tranCarInfo.getSendDateStart());
                               //更新
                               tranCarInfoService.updateById(tranCarInfo1);
                           }

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

@@ -7,7 +7,7 @@
         SELECT
         wbi.warehouse_name AS warehouseName,
         pp.id,
-        pp.goods_name AS gooodsName,
+        pp.goods_name AS goodsName,
         pp.water_min AS waterMin,
         pp.water_max AS waterMax,
         pp.water_base AS waterBase,