优化入库单审核流程

陈翱
1 parent 6b540ec5
Showing 12 changed files with 447 additions and 74 deletions
ant-design-vue-jeecg/src/api/api.js
ant-design-vue-jeecg/src/views/system/flow/FlowProcess.vue
ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue
ant-design-vue-jeecg/src/views/system/receipt/modules/ReceiptAuditModal.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/audit/controller/AuditController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/audit/entity/Audit.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/audit/entity/AuditFlow.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/audit/service/IAuditService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/audit/service/impl/AuditServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/flow/service/impl/FlowDetailServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptHeaderServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/utils/constant/QuantityConstant.java
@@ -215,6 +215,14 @@ export const queryWarehouse = (params) =&gt; getAction(&quot;/config/sysUserWarehouse/qu
 export const getAllWarehouseList = (params) => getAction("/config/warehouse/getAllWarehouseList", params);
 //查询所有库区
 export const getAllZoneList = (params) => getAction("/config/zone/getAllZoneList", params);
+
+//入库单提交审核
+export const createReceiptAuditFlow = (params) => getAction("/audit/audit/createReceiptAuditFlow", params);
+//入库单审核
+export const auditReceipt = (params) => getAction("/audit/audit/auditReceipt", params);
+//查询审核流程进度
+export const searchAuditFlow = (params) => getAction("/audit/audit/searchAuditFlow", params);
+
 // 中转HTTP请求
 export const transitRESTful = {
   get: (url, parameter) => getAction(getTransitURL(url), parameter),
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="close"
+    @cancel="close"
+    cancelText="关闭">
+  <a-card :bordered="false">
+    <div>
+      <div style="font-size: 16px; color: rgba(0, 0, 0, 0.85); font-weight: 500; margin-bottom: 20px;">订单编号:{{flowInfo.code}}</div>
+      <a-row style="margin-bottom: 16px">
+        <a-col :xs="24" :sm="12" :md="12" :lg="12" :xl="6">
+          <span style="color: rgba(0, 0, 0, 0.85)">创建人：{{flowInfo.createBy}}</span>
+        </a-col>
+        <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12">
+          <span style="color: rgba(0, 0, 0, 0.85)">创建时间：{{flowInfo.createTime}}</span>
+        </a-col>
+      </a-row>
+
+        <a-card :bordered="false"  title="流程进度">
+          <a-steps style="margin-right: 14px;" :direction="isMobile() && 'vertical' || 'horizontal'" :current="flowInfo.seq-1" progressDot>
+            <a-step v-for="(sa,index) in flowInfo.list" :title="sa.auditor">
+              <div style="fontSize: 12px; color: rgba(0, 0, 0, 0.45); position: relative; left:8px;"
+                   slot="description">
+                <div v-if="sa.sequence=='0'" style="margin: 8px 0 4px;font-size:16px;" >
+                  创建单据
+                </div>
+                <div v-if="sa.status=='1'&&index!=flowInfo.list.length-1" style="margin: 8px 0 4px;font-size:16px;color: #00DB00">
+                  审核通过
+                </div>
+                <div v-if="sa.status=='2'" style="margin: 8px 0 4px;font-size:16px;color: red">
+                  审核驳回
+                </div>
+                <div v-if="sa.status==null&&sa.sequence!='0'" style="margin: 8px 0 4px;font-size:16px;color:lightseagreen">
+                  待审核
+                </div>
+                <div v-if="sa.status=='1'&&index==flowInfo.list.length-1" style="margin: 8px 0 4px;font-size:16px;color: #50bfff">
+                  审核完成
+                </div>
+                <div v-if="sa.remark!=null&&sa.remark!=''" style="margin: 8px 0 4px">
+                  备注:{{sa.remark}}
+                </div>
+                <div v-if="sa.updateTime==null" style="margin: 8px 0 4px">
+                  时间:{{sa.createTime}}
+                </div>
+                <div v-if="sa.updateTime!=null" style="margin: 8px 0 4px">
+                  时间:{{sa.updateTime}}
+                </div>
+              </div>
+            </a-step>
+          </a-steps>
+        </a-card>
+    </div>
+  </a-card>
+  </j-modal>
+</template>
+
+<script>
+
+import {mixinDevice} from '@/utils/mixin.js'
+import {searchAuditFlow} from '@/api/api'
+const directionType = {
+  horizontal: 'horizontal',
+  vertical: 'vertical'
+}
+
+export default {
+  name: "Success",
+  components: {
+  },
+  mixins: [mixinDevice],
+  data() {
+    return {
+      confirmLoading: false,
+      visible: false,
+      title: '审核流程进度',
+      width: 1100,
+      directionType,
+      flowInfo:[]
+    }
+  },
+  methods: {
+    close() {
+      this.$emit('close');
+      this.visible = false;
+      this.$refs.form.clearValidate();
+    },
+    edit(record) {
+      this.visible = true;
+      let params={
+          receiptId:record.id,
+      }
+      searchAuditFlow(params).then((res) => {
+         this.flowInfo=res;
+      });
+    },
+  }
+}
+</script>
+
+<style >
+.ant-steps-item-description{
+  margin-right: 14px !important;
+}
+</style>
 \ No newline at end of file
@@ -176,13 +176,17 @@
           <a-popconfirm v-has="'receiptHeader:back'" v-if="record.lastStatus == 800" title="确定回传吗?" @confirm="() => hanleBack(record)">
           	<a><a-button type="default">回传</a-button><a-divider type="vertical"/></a>
           </a-popconfirm>
-          <a v-if="record.lastStatus < 800 && record.nextAuditor ==null " @click="receive(record)" v-has="'receiptHeader:receive'"><a-button type="primary">组盘</a-button><a-divider type="vertical"/></a>
+          <a v-if="record.lastStatus < 800 && record.firstStatus ==15 " @click="receive(record)" v-has="'receiptHeader:receive'"><a-button type="primary">组盘</a-button><a-divider type="vertical"/></a>
+          <a v-if="record.firstStatus == '0' " @click="createAudit(record)"><a-button type="primary">提交审核</a-button><a-divider type="vertical"/></a>
           <a v-if="record.nextAuditor == username " @click="audit(record)"><a-button type="primary">审核</a-button><a-divider type="vertical"/></a>
           <a v-if="record.lastStatus == 850" @click="viewReason(record)"><a-button type="danger">原因</a-button><a-divider type="vertical"/></a>
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
             <a-menu slot="overlay">
                <a-menu-item v-has="'receiptHeader:edit'">
+                  <a v-if="record.firstStatus > 0 " @click="openProcess(record)"><a-button type="primary">审核进度</a-button><a-divider type="vertical"/></a>
+               </a-menu-item>
+              <a-menu-item v-has="'receiptHeader:edit'">
                   <a @click="handleEdit(record)">编辑</a>
                </a-menu-item>
               <a-menu-item v-has="'receiptHeader:delete'">
@@ -207,6 +211,7 @@
     <receiptHeader-modal ref="modalForm" @ok="modalFormOk"></receiptHeader-modal>
     <receive-modal ref="modalForm2" @ok="modalFormOk"></receive-modal>
     <receipt-audit-modal ref="auditForm"></receipt-audit-modal>
+    <flow-process ref="porcessForm"></flow-process>
   </a-card>
 </template>
  
@@ -221,9 +226,10 @@ import {initDictOptions, filterMultiDictText} from &#39;@/components/dict/JDictSelec
 import '@/assets/less/TableExpand.less'
 import {getCompanyList} from '@/api/api'
 import {getReceiptTypeList} from '@/api/api'
-import {getSupplierList, backErpReceipt} from '@/api/api'
+import {getSupplierList, backErpReceipt,createReceiptAuditFlow} from '@/api/api'
 import ReceiveModal from "./modules/ReceiveModal";
 import { notification } from 'ant-design-vue';
+import FlowProcess from "../flow/FlowProcess";
 import store from '@/store'
  
  
@@ -235,6 +241,7 @@ export default {
     ReceiveModal,
     ReceiptDetailList,
     ReceiptHeaderModal,
+    FlowProcess,
     username:''
   },
   data() {
@@ -418,8 +425,26 @@ export default {
       this.selectedMainId = ''
     },
     audit(record){
-      this.$refs.auditForm.edit(record)
-
+      this.$refs.auditForm.edit(record,this.username)
+    },
+    createAudit(record){
+      let params={
+        receiptId:record.id,
+        type:record.type,
+        createBy:record.createBy
+      }
+      createReceiptAuditFlow(params).then((res) => {
+        if (res.success) {
+          //this.$message.success(res.message)
+          this.$refs.porcessForm.edit(record)
+          this.loadData();
+        }else {
+          this.$message.error(res.message)
+        }
+      });
+    },
+    openProcess(record){
+      this.$refs.porcessForm.edit(record)
     },
     onSelectChange(selectedRowKeys, selectionRows) {
       this.selectedMainId = selectedRowKeys[0].toString();
@@ -9,7 +9,7 @@
     @cancel="handleCancel"
     cancelText="关闭">
     <a-spin :spinning="confirmLoading">
-      <a-form-model ref="form" :model="model" :rules="validatorRules">
+      <a-form-model ref="form" :model="model" >
         <a-row>
           <a-col :span="24">
             <a-form-model-item label="审核结果" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="companyCode">
@@ -34,10 +34,7 @@
 <script>
  
 import {httpAction} from '@/api/manage'
-import {validateDuplicateValue} from '@/utils/util'
-import {getCompanyList} from '@/api/api'
-import {getReceiptTypeList} from '@/api/api'
-import {getSupplierList} from '@/api/api'
+import {auditReceipt} from '@/api/api'
  
 export default {
   name: "ReceiptAuditModal",
@@ -48,6 +45,8 @@ export default {
       width: 800,
       visible: false,
       model: {},
+      receiptId: '',
+      username: '',
       labelCol: {
         xs: {span: 24},
         sm: {span: 5},
@@ -70,7 +69,9 @@ export default {
     this.modelDefault = JSON.parse(JSON.stringify(this.model));
   },
   methods: {
-    edit(record) {
+    edit(record,username) {
+      this.receiptId=record.id
+      this.username=username
       this.model = Object.assign({}, record);
       this.visible = true;
     },
@@ -80,35 +81,21 @@ export default {
       this.$refs.form.clearValidate();
     },
     handleOk() {
-      const that = this;
-      // 触发表单验证
-      this.$refs.form.validate(valid => {
-        if (valid) {
-          that.confirmLoading = true;
-          let httpurl = '';
-          let method = '';
-          if (!this.model.id) {
-            httpurl += this.url.add;
-            method = 'post';
-          } else {
-            httpurl += this.url.edit;
-            method = 'put';
-          }
-          httpAction(httpurl, this.model, method).then((res) => {
-            if (res.success) {
-              that.$message.success(res.message);
-              that.$emit('ok');
-            } else {
-              that.$message.warning(res.message);
-            }
-          }).finally(() => {
-            that.confirmLoading = false;
-            that.close();
-          })
-        } else {
-          return false
+      let params={
+        receiptId:this.receiptId,
+        status:this.model.status,
+        remark:this.model.remark,
+        auditorid:this.username
+      }
+      auditReceipt(params).then((res) => {
+        if (res.success) {
+          this.$message.success(res.message)
+          this.visible = false;
+          this.loadData();
+        }else {
+          this.$message.error(res.message)
         }
-      })
+      });
     },
     handleCancel() {
       this.close()
@@ -13,6 +13,7 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.wms.audit.entity.Audit;
+import org.jeecg.modules.wms.audit.entity.AuditFlow;
 import org.jeecg.modules.wms.audit.service.IAuditService;
  
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -49,7 +50,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class AuditController extends JeecgController<Audit, IAuditService> {
 	@Autowired
 	private IAuditService auditService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -71,7 +72,7 @@ public class AuditController extends JeecgController&lt;Audit, IAuditService&gt; {
 		IPage<Audit> pageList = auditService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -85,7 +86,7 @@ public class AuditController extends JeecgController&lt;Audit, IAuditService&gt; {
 		auditService.save(audit);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -99,7 +100,7 @@ public class AuditController extends JeecgController&lt;Audit, IAuditService&gt; {
 		auditService.updateById(audit);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -113,7 +114,7 @@ public class AuditController extends JeecgController&lt;Audit, IAuditService&gt; {
 		auditService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -127,7 +128,7 @@ public class AuditController extends JeecgController&lt;Audit, IAuditService&gt; {
 		this.auditService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *
@@ -168,4 +169,22 @@ public class AuditController extends JeecgController&lt;Audit, IAuditService&gt; {
         return super.importExcel(request, response, Audit.class);
     }
  
+	 @ApiOperation(value="提交入库单审核", notes="提交入库单审核")
+	 @GetMapping(value = "/createReceiptAuditFlow")
+	 public Result<Audit> createReceiptAuditFlow(Audit audit) {
+		return auditService.createReceiptAuditFlow(audit);
+	 }
+
+	 @ApiOperation(value="入库单审核", notes="入库单审核")
+	 @GetMapping(value = "/auditReceipt")
+	 public Result<Audit> auditReceipt(Audit audit) {
+		 return auditService.auditReceipt(audit);
+	 }
+
+	 @ApiOperation(value="查询审核流程进度", notes="查询审核流程进度")
+	 @GetMapping(value = "/searchAuditFlow")
+	 public AuditFlow searchAuditFlow(Audit audit) {
+    	return auditService.searchAuditFlow(audit);
+	 }
+
 }
@@ -5,6 +5,7 @@ import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -75,4 +76,8 @@ public class Audit implements Serializable {
 	@Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
     private String remark;
+
+    /**单据类型*/
+    @TableField(exist = false)
+	private String type;
 }
+package org.jeecg.modules.wms.audit.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description: 审核表
+ * @Author: jeecg-boot
+ * @Date:   2023-07-26
+ * @Version: V1.0
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class AuditFlow implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    //单号
+	private String code;
+	//单据类型
+	private String type;
+	//创建人
+	private String createBy;
+	//创建时间
+    private Date createTime;
+
+    //当前审核序号
+    private Integer seq;
+
+    public List<Audit> list;
+}
 package org.jeecg.modules.wms.audit.service;
  
+import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.wms.audit.entity.Audit;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.wms.audit.entity.AuditFlow;
+import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptHeader;
  
 /**
  * @Description: 审核表
@@ -13,7 +16,7 @@ public interface IAuditService extends IService&lt;Audit&gt; {
     /**
      * 审核入库单据
      */
-    boolean auditReceipt(Audit audit);
+    Result<Audit> auditReceipt(Audit audit);
  
  
     /**
@@ -26,5 +29,21 @@ public interface IAuditService extends IService&lt;Audit&gt; {
      */
     Audit searchPreviousAuditor(Audit audit);
  
+    /**
+     * 判断审核流程是否走完
+     */
+    boolean judgmentFinsh(Audit audit);
+
+
+    /**
+     * 入库单提交审核
+     */
+    Result<Audit>createReceiptAuditFlow(Audit audit);
+
+    /**
+     * 查询单据审核进度
+     */
+    AuditFlow searchAuditFlow(Audit audit);
+
  
 }
 package org.jeecg.modules.wms.audit.service.impl;
  
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.apache.shiro.SecurityUtils;
+import org.checkerframework.checker.units.qual.A;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.wms.audit.entity.Audit;
+import org.jeecg.modules.wms.audit.entity.AuditFlow;
 import org.jeecg.modules.wms.audit.mapper.AuditMapper;
 import org.jeecg.modules.wms.audit.service.IAuditService;
+import org.jeecg.modules.wms.flow.entity.FlowDetail;
+import org.jeecg.modules.wms.flow.service.IFlowDetailService;
+import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptHeader;
+import org.jeecg.modules.wms.receipt.receiptHeader.service.IReceiptHeaderService;
+import org.jeecg.modules.wms.shipment.shipmentHeader.entity.ShipmentHeader;
+import org.jeecg.modules.wms.shipment.shipmentHeader.service.IShipmentHeaderService;
 import org.jeecg.utils.StringUtils;
+import org.jeecg.utils.constant.QuantityConstant;
 import org.springframework.stereotype.Service;
  
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  
+import javax.annotation.Resource;
+import javax.transaction.Transactional;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @Description: 审核表
  * @Author: jeecg-boot
@@ -17,8 +35,18 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  */
 @Service
 public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements IAuditService {
+    @Resource
+    private IReceiptHeaderService receiptHeaderService;
+    @Resource
+    private IShipmentHeaderService shipmentHeaderService;
+    @Resource
+    private IFlowDetailService iFlowDetailService;
+
+
+
     @Override
-    public boolean auditReceipt(Audit audit) {
+    @Transactional
+    public Result<Audit> auditReceipt(Audit audit) {
         //根据入库单id,用户名称,找到审核数据
         LambdaQueryWrapper<Audit>lambdaQueryWrapper=new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(Audit::getReceiptId,audit.getReceiptId())
@@ -27,16 +55,57 @@ public class AuditServiceImpl extends ServiceImpl&lt;AuditMapper, Audit&gt; implements
         if (StringUtils.isNotNull(audit1)){
             audit1.setStatus(audit.getStatus());
             audit1.setRemark(audit.getRemark());
-            this.updateById(audit1);
-        }
+            if(this.updateById(audit1)){
+                if (audit.getStatus().equals(QuantityConstant.AUDIT_YES_STATUS)){
+                    ReceiptHeader receiptHeader=new ReceiptHeader();
+                    receiptHeader.setId(Integer.parseInt(audit1.getReceiptId()));
+                    //查询下一个审核人
+                    Audit nextAudit=searchNextAuditor(audit1);
+                    if (StringUtils.isNull(nextAudit)){
+                        receiptHeader.setNextAuditor(String.valueOf(QuantityConstant.RECEIPT_HEADER_FINSH));
+                        receiptHeader.setFirstStatus(QuantityConstant.RECEIPT_HEADER_FINSH);
+                        receiptHeader.setLastStatus(QuantityConstant.RECEIPT_HEADER_FINSH);
+                        receiptHeaderService.updateById(receiptHeader);
+                        return Result.ok("审核流程结束!");
+                    }else{
+                        receiptHeader.setFirstStatus(QuantityConstant.RECEIPT_HEADER_VERIFYING);
+                        receiptHeader.setLastStatus(QuantityConstant.RECEIPT_HEADER_VERIFYING);
+                        receiptHeader.setNextAuditor(String.valueOf(nextAudit.getAuditorid()));
+                        receiptHeaderService.updateById(receiptHeader);
+                        return Result.ok("审核通过,下一审核人:"+nextAudit.getAuditor());
+                    }
  
-        return false;
+                }else{
+                    //驳回
+                    ReceiptHeader receiptHeader=new ReceiptHeader();
+                    receiptHeader.setId(Integer.parseInt(audit1.getReceiptId()));
+                    //查询上一个审核人
+                    Audit nextAudit=searchPreviousAuditor(audit1);
+                    if (StringUtils.isNull(nextAudit)){
+                        //驳回到创建人
+                        receiptHeader.setNextAuditor(null);
+                        receiptHeader.setFirstStatus(QuantityConstant.RECEIPT_HEADER_BUILD);
+                        receiptHeader.setLastStatus(QuantityConstant.RECEIPT_HEADER_BUILD);
+                        receiptHeaderService.updateById(receiptHeader);
+                        return Result.ok("驳回到创建人!");
+                    }else {
+                        receiptHeader.setNextAuditor(String.valueOf(nextAudit.getAuditorid()));
+                        receiptHeader.setFirstStatus(QuantityConstant.RECEIPT_HEADER_REJECTED);
+                        receiptHeader.setLastStatus(QuantityConstant.RECEIPT_HEADER_REJECTED);
+                        receiptHeaderService.updateById(receiptHeader);
+                        return Result.ok("审核驳回,下一审核人:"+nextAudit.getAuditor());
+                    }
+                }
+            }
+        }
+        return Result.error("审核失败!!");
     }
  
     @Override
     public Audit searchNextAuditor(Audit audit) {
         LambdaQueryWrapper<Audit>lambdaQueryWrapper=new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(Audit::getReceiptId,audit.getReceiptId())
+        lambdaQueryWrapper.eq(StringUtils.isNotEmpty(audit.getReceiptId()),Audit::getReceiptId,audit.getReceiptId())
+                .eq(StringUtils.isNotEmpty(audit.getShipmentId()),Audit::getShipmentId,audit.getShipmentId())
                 .gt(Audit::getSequence,audit.getSequence())
                 .orderByAsc(Audit::getSequence).last("limit 1");
         Audit audit1=this.getOne(lambdaQueryWrapper);
@@ -46,10 +115,114 @@ public class AuditServiceImpl extends ServiceImpl&lt;AuditMapper, Audit&gt; implements
     @Override
     public Audit searchPreviousAuditor(Audit audit) {
         LambdaQueryWrapper<Audit>lambdaQueryWrapper=new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(Audit::getReceiptId,audit.getReceiptId())
+        lambdaQueryWrapper.eq(StringUtils.isNotEmpty(audit.getReceiptId()),Audit::getReceiptId,audit.getReceiptId())
+                .eq(StringUtils.isNotEmpty(audit.getShipmentId()),Audit::getShipmentId,audit.getShipmentId())
                 .lt(Audit::getSequence,audit.getSequence())
                 .orderByDesc(Audit::getSequence).last("limit 1");
         Audit audit1=this.getOne(lambdaQueryWrapper);
         return audit1;
     }
+
+    @Override
+    public boolean judgmentFinsh(Audit audit) {
+        LambdaQueryWrapper<Audit>lambdaQueryWrapper=new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(StringUtils.isNotEmpty(audit.getReceiptId()),Audit::getReceiptId,audit.getReceiptId())
+                .eq(StringUtils.isNotEmpty(audit.getShipmentId()),Audit::getShipmentId,audit.getShipmentId())
+                .orderByDesc(Audit::getSequence).last("limit 1");
+        Audit audit1=this.getOne(lambdaQueryWrapper);
+        boolean flag=false;
+        if (StringUtils.isNotNull(audit1)){
+            if (QuantityConstant.AUDIT_YES_STATUS.equals(audit.getStatus())){
+                flag= true;
+            }
+        }
+        return flag;
+    }
+
+    @Override
+    @Transactional
+    public Result<Audit> createReceiptAuditFlow(Audit audit) {
+        //先把提交人加入审核表
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        if (!sysUser.getRealname().equals(audit.getCreateBy())){
+            return Result.error("当前单据提交人,不是单据创建人!!!");
+        }
+        //查询当前单据是否有审核流程
+        List<FlowDetail> flowDetailList=iFlowDetailService.getFlowDetailList(QuantityConstant.RECEIPT_AUDIT,audit.getType());
+        if (flowDetailList.size()>0){
+            Audit audit0=new Audit();
+            audit0.setReceiptId(String.valueOf(audit.getReceiptId()));
+            audit0.setAuditor(sysUser.getRealname());
+            audit0.setAuditorid(sysUser.getUsername());
+            audit0.setSequence(0);
+            if (!this.save(audit0)){
+                throw new JeecgBootException("提交审核失败!!");
+            }
+            List<Audit>auditList=new ArrayList<>();
+            for (FlowDetail flowDetail:flowDetailList){
+                Audit audit1=new Audit();
+                audit1.setAuditor(flowDetail.getAuditor());
+                audit1.setAuditorid(flowDetail.getAuditorId());
+                audit1.setSequence(flowDetail.getSequence());
+                audit1.setReceiptId(String.valueOf(audit.getReceiptId()));
+                auditList.add(audit1);
+            }
+            if(this.saveBatch(auditList)){
+                //更新入库单头表,下一个审核人id
+                ReceiptHeader receiptHeader1=new ReceiptHeader();
+                receiptHeader1.setId(Integer.valueOf(audit.getReceiptId()));
+                receiptHeader1.setFirstStatus(QuantityConstant.RECEIPT_HEADER_VERIFYING);
+                receiptHeader1.setLastStatus(QuantityConstant.RECEIPT_HEADER_VERIFYING);
+                receiptHeader1.setNextAuditor(flowDetailList.get(0).getAuditorId());
+                receiptHeaderService.updateById(receiptHeader1);
+            }
+            return Result.ok("提交审核成功,下一审核人:"+flowDetailList.get(0).getAuditor());
+        }else{
+            //没有审核流程,直接审核完成
+            ReceiptHeader receiptHeader1=new ReceiptHeader();
+            receiptHeader1.setId(Integer.valueOf(audit.getReceiptId()));
+            receiptHeader1.setFirstStatus(QuantityConstant.RECEIPT_HEADER_FINSH);
+            receiptHeader1.setLastStatus(QuantityConstant.RECEIPT_HEADER_FINSH);
+            receiptHeaderService.updateById(receiptHeader1);
+            return Result.ok("当前单据没有审核流程,直接完成!!");
+        }
+    }
+
+    @Override
+    public AuditFlow searchAuditFlow(Audit audit) {
+        AuditFlow auditFlow=new AuditFlow();
+        //查询单据信息
+        if (StringUtils.isNotEmpty(audit.getReceiptId())){
+            ReceiptHeader receiptHeader=receiptHeaderService.getById(audit.getReceiptId());
+            auditFlow.setCode(receiptHeader.getCode());
+            auditFlow.setCreateBy(receiptHeader.getCreateBy());
+            auditFlow.setCreateTime(receiptHeader.getCreateTime());
+            auditFlow.setType(receiptHeader.getType());
+        }
+        if (StringUtils.isNotEmpty(audit.getShipmentId())){
+            ShipmentHeader shipmentHeader=shipmentHeaderService.getById(audit.getShipmentId());
+            auditFlow.setCode(shipmentHeader.getCode());
+            auditFlow.setCreateBy(shipmentHeader.getCreateBy());
+            auditFlow.setCreateTime(shipmentHeader.getCreateTime());
+            auditFlow.setType(shipmentHeader.getType());
+        }
+        LambdaQueryWrapper<Audit>lambdaQueryWrapper=new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(StringUtils.isNotEmpty(audit.getReceiptId()),Audit::getReceiptId,audit.getReceiptId())
+         .eq(StringUtils.isNotEmpty(audit.getShipmentId()),Audit::getShipmentId,audit.getShipmentId())
+                .orderByAsc(Audit::getSequence);
+        List<Audit>list=this.list(lambdaQueryWrapper);
+        auditFlow.setList(list);
+
+        //查询当前审核序号
+        LambdaQueryWrapper<Audit>lambdaQueryWrapper2=new LambdaQueryWrapper<>();
+        lambdaQueryWrapper2.eq(StringUtils.isNotEmpty(audit.getReceiptId()),Audit::getReceiptId,audit.getReceiptId())
+                .eq(StringUtils.isNotEmpty(audit.getShipmentId()),Audit::getShipmentId,audit.getShipmentId())
+                .eq(Audit::getStatus,1)
+                .orderByDesc(Audit::getSequence).last("limit 1");
+        Audit audit1=this.getOne(lambdaQueryWrapper2);
+        if (StringUtils.isNotNull(audit1)){
+            auditFlow.setSeq(audit1.getSequence()+1);
+        }
+        return auditFlow;
+    }
 }
@@ -7,6 +7,7 @@ import org.jeecg.modules.wms.flow.mapper.FlowDetailMapper;
 import org.jeecg.modules.wms.flow.service.IFlowDetailService;
 import org.jeecg.modules.wms.flow.service.IFlowHeaderService;
 import org.jeecg.utils.StringUtils;
+import org.jeecg.utils.constant.QuantityConstant;
 import org.springframework.stereotype.Service;
  
 import java.util.ArrayList;
@@ -42,12 +43,14 @@ public class FlowDetailServiceImpl extends ServiceImpl&lt;FlowDetailMapper, FlowDet
 		LambdaQueryWrapper<FlowHeader>lambdaQueryWrapper=new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(FlowHeader::getDocumentType,documentType)
 				.eq(FlowHeader::getFlowType,flowType)
+				 .eq(FlowHeader::getFlowStatus, 1)
 				.orderByDesc(FlowHeader::getId).last("limit 1");
 		FlowHeader flowHeader=iFlowHeaderService.getOne(lambdaQueryWrapper);
 		//没有根据单据类型,找到流程就根据入库单类型查找
 		if (StringUtils.isNull(flowHeader)){
 			lambdaQueryWrapper=new LambdaQueryWrapper<>();
 			lambdaQueryWrapper.eq(FlowHeader::getFlowType,flowType)
+					.eq(FlowHeader::getFlowStatus, 1)
 					.orderByDesc(FlowHeader::getId).last("limit 1");
 			flowHeader=iFlowHeaderService.getOne(lambdaQueryWrapper);
 		}
@@ -123,29 +123,6 @@ public class ReceiptHeaderServiceImpl extends ServiceImpl&lt;ReceiptHeaderMapper, R
         if (!success) {
             return Result.OK("添加失败！");
         }
-        //查询当前单据是否有审核流程
-        List<FlowDetail>flowDetailList=iFlowDetailService.getFlowDetailList(QuantityConstant.RECEIPT_AUDIT,receiptHeader.getType());
-        if (flowDetailList.size()>0){
-            List<Audit>auditList=new ArrayList<>();
-            for (FlowDetail flowDetail:flowDetailList){
-                Audit audit=new Audit();
-                audit.setAuditor(flowDetail.getAuditor());
-                audit.setAuditorid(flowDetail.getAuditorId());
-                audit.setSequence(flowDetail.getSequence());
-                audit.setReceiptId(String.valueOf(receiptHeader.getId()));
-                auditList.add(audit);
-            }
-            if(iAuditService.saveBatch(auditList)){
-                //更新入库单头表,下一个审核人id
-                ReceiptHeader receiptHeader1=new ReceiptHeader();
-                receiptHeader1.setId(receiptHeader.getId());
-                receiptHeader1.setNextAuditor(flowDetailList.get(0).getAuditorId());
-                receiptHeaderService.updateById(receiptHeader1);
-            }
-        }
-        if (!success) {
-            return Result.OK("添加失败！");
-        }
         return Result.OK("添加成功！", receiptHeader);
     }
  
@@ -388,6 +388,13 @@ public class QuantityConstant {
     // 出库单审核流程
     public static final Integer SHIPMENT_AUDIT = 2;
  
+    //审核通过
+    public static final Integer AUDIT_YES_STATUS = 1;
+    //审核驳回
+    public static final Integer AUDIT_NO_STATUS = 2;
+
+
+
     // WCS库位信息查询
     public static final String ADDRESS_WCS_LOCATION_INFO = "WCS_LOCATION_INFO";