修改

winsea-haixin-platform-backend/src/main/resources/application.yml

@@ -39,6 +39,8 @@ auth:
     - /workflowSync/api/startFlow
     - /office/*
     - /warehouseInOutInfo/*
+    - /identityAuthenticationInfo/*
+    - /purchaseOrder/*
     - /auth/api/phoneLogin
     - /system/query/getComanyMgrUrl
     - /saas/**/*

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/constant/StatusEnum.java

@@ -59,13 +59,14 @@ public enum StatusEnum {
     TASK_DO("5", "执行中", "Under implementation"),
     TASK_COMPLETED("7", "已完成", "Completed"),
 
-    // 采购订单显示标识
+    // 采购计划显示标识
     PURCHASE_HIDE("0","隐藏",""),
     PURCHASE_SHOW("1","显示",""),
 
-    //采购订单状态
+    //采购计划状态
     ORDER_REVIEWED("1", "待审核", "reviewed"),
     ORDER_PASSED("3", "已通过", "passed"),
+    ORDER_REJECTED("4", "已驳回", "rejected"),
     ORDER_DEALED("5", "已成交", "dealed"),
     ORDER_COMPLETED("7", "已完成", "Completed"),
 

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

@@ -4,6 +4,8 @@ package com.yh.saas.plugin.yiliangyiyun.controller;
 
 import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.plugin.yiliangyiyun.entity.IdentityAuthenticationInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInOutInfo;
+import com.yh.saas.plugin.yiliangyiyun.exception.ServiceException;
 import com.yh.saas.plugin.yiliangyiyun.service.IIdentityAuthenticationInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -79,5 +81,13 @@ public class IdentityAuthenticationInfoController {
     public void deleteIdentityAuthenticationInfo(@RequestBody IdentityAuthenticationInfo identityAuthenticationInfo) {
         iIdentityAuthenticationInfoService.deleteIdentityAuthenticationInfo(identityAuthenticationInfo.getId());
     }
+    /**
+     * 查看
+     */
+    @GetMapping("/getInfo")
+    public IdentityAuthenticationInfo getInfo(@RequestParam String commonId) throws ServiceException {
+        return iIdentityAuthenticationInfoService.getInfo(commonId);
+    }
+
 }
 

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

@@ -83,6 +83,16 @@ public class ProcurementPlanInfoController {
         return procurementPlanInfoService.editStatus(id,basisPrice,unitPrice,flag);
 
     }
+    /**
+     * 审核
+     * @param id
+     * @return
+     */
+    @PostMapping("/api/examine")
+    public String examine(String id,Integer flag){
+        return procurementPlanInfoService.examine(id,flag);
+
+    }
 
 }
 

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

@@ -132,5 +132,13 @@ public class WarehouseInOutInfoController {
         return warehouseInOutInfoService.selectTaskNo(moveTaskNo);
     }
 
+    /**
+     * 查看入库详情
+     */
+    @GetMapping("/getInfo")
+    public WarehouseInOutInfo getInfo(@RequestParam String id) {
+        return warehouseInOutInfoService.getInfo(id);
+    }
+
 }
 

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

@@ -225,10 +225,10 @@ public class ProcurementPlanInfo extends BaseModel<ProcurementPlanInfo> {
      */
     @TableField(exist = false)
     private String searchKeyWord;
+
     /**
      * PC端(传1)
      */
-    @TableField(exist = false)
     private String pcFlag;
 
 

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

@@ -81,4 +81,14 @@ public class WarehouseInOutDetail extends BaseModel<WarehouseInOutDetail> {
         return this.id;
     }
 
+    public static class QueryFiles {
+
+        public static final String INFO_ID = "info_id";
+
+        public static final String DELETE_FLAG = "delete_flag";
+
+
+
+    }
+
 }

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

@@ -71,6 +71,11 @@ public class ExceptionDefinition {
     public static  ServiceExceptionDefinition DRIVER_NOT_CERTIFIED =
             new ServiceExceptionDefinition(11015, "司机未认证身份");
 
+    public static  ServiceExceptionDefinition UNAUTHENTICATED_GRAIN_MERCHANT_IDENTITY=
+            new ServiceExceptionDefinition(11016, "未认证粮商身份，请完善身份信息");
+
+    public static  ServiceExceptionDefinition IDENTITY_IS_BEING_AUDITED =
+            new ServiceExceptionDefinition(11017, "粮商身份正在审核中");
 
     public static  ServiceExceptionDefinition ADDRESS_DATABASE_QUERY_FAILED  =
             new ServiceExceptionDefinition(16002, "执行语句失败");

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

@@ -29,6 +29,8 @@ public enum YExceptionEnum {
 	FAILED_TO_EXAMINE("ERROR","该身份认证还未通过审核，无法更换手机号"),
 	AUTHENTICATION_INFORMATION_CHANGE_FAILED("ERROR","身份认证状态审核中或已通过审核，无法更改身份认证信息"),
 	PURCHASE_ORDER_ERROR("PURCHASE-001", "采购订单审核没有可以进行的工作流！"),
+
+
 	;
 	@Getter
 	private String value;

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

@@ -1,8 +1,10 @@
 package com.yh.saas.plugin.yiliangyiyun.service;
 
 import com.baomidou.mybatisplus.plugins.Page;
+import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.IdentityAuthenticationInfo;
 import com.baomidou.mybatisplus.service.IService;
+import com.yh.saas.plugin.yiliangyiyun.exception.ServiceException;
 
 /**
  * <p>
@@ -43,4 +45,9 @@ public interface IIdentityAuthenticationInfoService extends IService<IdentityAut
      * @param id
      */
     void deleteIdentityAuthenticationInfo(String id);
+    /**
+     * 查看
+     * @param
+     */
+    IdentityAuthenticationInfo getInfo(String commonId) throws ServiceException;
 }

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

@@ -54,4 +54,12 @@ public interface IProcurementPlanInfoService extends IService<ProcurementPlanInf
      */
     String editStatus(String id,String basisPrice,String unitPrice,Integer flag);
 
+    /**
+     * 审核
+     * @param id
+     * @param flag 1通过 2 驳回
+     * @return
+     */
+    String examine(String id,Integer flag);
+
 }

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

@@ -82,4 +82,10 @@ public interface IWarehouseInOutInfoService extends IService<WarehouseInOutInfo>
      * @return
      */
     boolean selectTaskNo(String moveTaskNo);
+    /**
+     * 查看
+     *
+     * @param
+     */
+    WarehouseInOutInfo getInfo(String id);
 }

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

@@ -7,13 +7,14 @@ import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.IdentityAuthenticationInfo;
-import com.yh.saas.plugin.yiliangyiyun.exception.YException;
-import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
+import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInOutInfo;
+import com.yh.saas.plugin.yiliangyiyun.exception.*;
 import com.yh.saas.plugin.yiliangyiyun.mapper.IdentityAuthenticationInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.*;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.sqlite.util.StringUtils;
 
 import java.util.List;
 
@@ -132,5 +133,29 @@ public class IdentityAuthenticationInfoServiceImpl extends ServiceImpl<IdentityA
             this.deleteById(identityAuthenticationInfo.getId());
         }
     }
+
+    /**
+     * 查看
+     * @param
+     */
+    @Override
+    public IdentityAuthenticationInfo getInfo(String commonId)throws ServiceException {
+        //判断粮商是否存在
+        IdentityAuthenticationInfo identityAuthenticationInfo =
+                this.selectOne(new EntityWrapper<IdentityAuthenticationInfo>()
+                        .eq(IdentityAuthenticationInfo.QueryFiles.COMMON_ID, commonId)
+                        .eq(IdentityAuthenticationInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
+        if(identityAuthenticationInfo!=null){
+            //身份审核中
+            if ("1".equals(identityAuthenticationInfo.getAuthenticationStatusKey())){
+                throw new AppServiceException(ExceptionDefinition.IDENTITY_IS_BEING_AUDITED);
+            }
+        }
+        //粮商不存在
+        else {
+            throw new AppServiceException(ExceptionDefinition.UNAUTHENTICATED_GRAIN_MERCHANT_IDENTITY);
+        }
+        return identityAuthenticationInfo;
+    }
 }
 

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

@@ -170,4 +170,32 @@ public class ProcurementPlanInfoServiceImpl extends ServiceImpl<ProcurementPlanI
         return "NG";
 
     }
+
+    /**
+     * 审核
+     * @param id
+     * @param flag 1通过 2 驳回
+     * @return
+     */
+    @Override
+    public String examine(String id,Integer flag) {
+        //查询采购计划列表
+        ProcurementPlanInfo procurementPlanInfo = this.selectById(id);
+        if (procurementPlanInfo != null ){
+            //通过
+            if(flag==1){
+                procurementPlanInfo.setStatusFlag(StatusEnum.ORDER_PASSED.getFlag());
+                procurementPlanInfo.setStatus(StatusEnum.ORDER_PASSED.getName());
+            }
+            //驳回
+            else{
+                procurementPlanInfo.setStatusFlag(StatusEnum.ORDER_REJECTED.getFlag());
+                procurementPlanInfo.setStatus(StatusEnum.ORDER_REJECTED.getName());
+            }
+            //更改采购计划信息
+            this.updateById(procurementPlanInfo);
+            return "OK";
+        }
+        return "NG";
+    }
 }

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

@@ -442,5 +442,18 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
             return false;
         }
     }
+    /**
+     * 查看
+     * @param
+     */
+    @Override
+    public WarehouseInOutInfo getInfo(String id) {
+        // 主表信息
+        WarehouseInOutInfo warehouseInOutInfo = this.selectById(id);
+        //详情信息
+        WarehouseInOutDetail warehouseInOutDetail = warehouseInOutDetailService.selectOne(new EntityWrapper<WarehouseInOutDetail>().eq(WarehouseInOutDetail.QueryFiles.INFO_ID, id));
+        warehouseInOutInfo.setWarehouseInOutDetail(warehouseInOutDetail);
+        return warehouseInOutInfo;
+    }
 
 }

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

@@ -9,7 +9,6 @@
         left join warehouse_in_out_detail d on w.id=d.info_id
         WHERE
         w.delete_flag = '0'
-        and w.status_flag = '3'
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 2">
                 AND w.in_out_flag = '1'
@@ -21,6 +20,7 @@
         <if test="pcFlag != null and pcFlag != ''">
             AND w.base_id = #{baseId}
             and w.position_id = #{positionId}
+            and w.status_flag = '3'
         </if>
         <if test="statusFlag != null and statusFlag != ''">
             AND w.status_flag = #{statusFlag}
@@ -40,8 +40,11 @@
         w.in_out_type as inOutType,
         w.contract_no as contractNo,
         w.car_no as carNo,
+        w.tran_car_no as tranCarNo,
         w.agent,
         w.back_office as backOffice,
+        w.status_flag as statusFlag,
+        w.status as status,
         w.create_date as createDate,
         d.water_content as waterContent,
         d.bulk_density as bulkDensity,
@@ -55,7 +58,6 @@
         left join warehouse_in_out_detail d on w.id=d.info_id
         WHERE
         w.delete_flag = '0'
-        and w.status_flag = '3'
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 2">
                 AND w.in_out_flag = '1'
@@ -67,6 +69,7 @@
         <if test="pcFlag != null and pcFlag != ''">
             AND w.base_id = #{baseId}
             and w.position_id = #{positionId}
+            and w.status_flag = '3'
         </if>
         <if test="statusFlag != null and statusFlag != ''">
             AND w.status_flag = #{statusFlag}