From 69ca5d23033b7e8e4bca5c3ac713d3f3d10b8e2a Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Thu, 22 Aug 2024 00:20:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=88=E5=AE=A1=E6=A0=B8=E5=90=8E=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E7=9A=84=E5=BC=80=E5=85=B3=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-boot/docs/jsh_erp.sql                  |   3 +-
 .../docs/数据库更新记录-首次安装请勿使用.txt  |   9 +-
 .../erp/datasource/entities/SystemConfig.java |  10 +
 .../entities/SystemConfigExample.java         |  70 +++
 .../systemConfig/SystemConfigService.java     |  12 +-
 .../mapper_xml/SystemConfigMapper.xml         | 484 ------------------
 .../src/views/system/SystemConfigList.vue     |  18 +-
 7 files changed, 111 insertions(+), 495 deletions(-)
 delete mode 100644 jshERP-boot/src/main/resources/mapper_xml/SystemConfigMapper.xml

diff --git a/jshERP-boot/docs/jsh_erp.sql b/jshERP-boot/docs/jsh_erp.sql
index 332dd044a..60b169e5d 100644
--- a/jshERP-boot/docs/jsh_erp.sql
+++ b/jshERP-boot/docs/jsh_erp.sql
@@ -872,6 +872,7 @@ CREATE TABLE `jsh_system_config` (
   `in_out_manage_flag` varchar(1) DEFAULT '0' COMMENT '出入库管理启用标记，0未启用，1启用',
   `multi_account_flag` varchar(1) DEFAULT '0' COMMENT '多账户启用标记，0未启用，1启用',
   `move_avg_price_flag` varchar(1) DEFAULT '0' COMMENT '移动平均价启用标记，0未启用，1启用',
+  `audit_print_flag` varchar(1) DEFAULT '0' COMMENT '先审核后打印启用标记，0未启用，1启用',
   `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id',
   `delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除',
   PRIMARY KEY (`id`)
@@ -880,7 +881,7 @@ CREATE TABLE `jsh_system_config` (
 -- ----------------------------
 -- Records of jsh_system_config
 -- ----------------------------
-INSERT INTO `jsh_system_config` VALUES ('11', '公司test', '小李', '地址1', '12345678', null, null, '注：本单为我公司与客户约定账期内结款的依据，由客户或其单位员工签字生效，并承担法律责任。', '0', '0', '1', '0', '0', '', '0', '1', '0', '0', '0', '0', '63', '0');
+INSERT INTO `jsh_system_config` VALUES ('11', '公司test', '小李', '地址1', '12345678', null, null, '注：本单为我公司与客户约定账期内结款的依据，由客户或其单位员工签字生效，并承担法律责任。', '0', '0', '1', '0', '0', '', '0', '1', '0', '0', '0', '0', '0', '63', '0');
 
 -- ----------------------------
 -- Table structure for jsh_tenant
diff --git a/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt b/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt
index de89da697..98580f9fb 100644
--- a/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt
+++ b/jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt
@@ -1595,4 +1595,11 @@ update jsh_system_config set multi_account_flag='1' where multi_account_flag='0'
 -- 给实时库存表增加当前单价字段
 -- --------------------------------------------------------
 alter table jsh_system_config add move_avg_price_flag varchar(1) DEFAULT '0' COMMENT '移动平均价启用标记，0未启用，1启用' after multi_account_flag;
-alter table jsh_material_current_stock add current_unit_price decimal(24,6) DEFAULT NULL COMMENT '当前单价' after current_number;
\ No newline at end of file
+alter table jsh_material_current_stock add current_unit_price decimal(24,6) DEFAULT NULL COMMENT '当前单价' after current_number;
+
+-- --------------------------------------------------------
+-- 时间 2024年8月21日
+-- by jishenghua
+-- 给系统参数表增加先审核后打印启用标记，启用后，零售、采购、销售等单据，都需要先审核之后才能进行打印
+-- --------------------------------------------------------
+alter table jsh_system_config add audit_print_flag varchar(1) DEFAULT '0' COMMENT '先审核后打印启用标记，0未启用，1启用' after move_avg_price_flag;
\ No newline at end of file
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfig.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfig.java
index 09f239725..7d3edde61 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfig.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfig.java
@@ -41,6 +41,8 @@ public class SystemConfig {
 
     private String moveAvgPriceFlag;
 
+    private String auditPrintFlag;
+
     private Long tenantId;
 
     private String deleteFlag;
@@ -205,6 +207,14 @@ public class SystemConfig {
         this.moveAvgPriceFlag = moveAvgPriceFlag == null ? null : moveAvgPriceFlag.trim();
     }
 
+    public String getAuditPrintFlag() {
+        return auditPrintFlag;
+    }
+
+    public void setAuditPrintFlag(String auditPrintFlag) {
+        this.auditPrintFlag = auditPrintFlag == null ? null : auditPrintFlag.trim();
+    }
+
     public Long getTenantId() {
         return tenantId;
     }
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfigExample.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfigExample.java
index 61e2d9957..5404f2416 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfigExample.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/SystemConfigExample.java
@@ -1494,6 +1494,76 @@ public class SystemConfigExample {
             return (Criteria) this;
         }
 
+        public Criteria andAuditPrintFlagIsNull() {
+            addCriterion("audit_print_flag is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditPrintFlagIsNotNull() {
+            addCriterion("audit_print_flag is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditPrintFlagEqualTo(String value) {
+            addCriterion("audit_print_flag =", value, "auditPrintFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditPrintFlagNotEqualTo(String value) {
+            addCriterion("audit_print_flag <>", value, "auditPrintFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditPrintFlagGreaterThan(String value) {
+            addCriterion("audit_print_flag >", value, "auditPrintFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditPrintFlagGreaterThanOrEqualTo(String value) {
+            addCriterion("audit_print_flag >=", value, "auditPrintFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditPrintFlagLessThan(String value) {
+            addCriterion("audit_print_flag <", value, "auditPrintFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditPrintFlagLessThanOrEqualTo(String value) {
+            addCriterion("audit_print_flag <=", value, "auditPrintFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditPrintFlagLike(String value) {
+            addCriterion("audit_print_flag like", value, "auditPrintFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditPrintFlagNotLike(String value) {
+            addCriterion("audit_print_flag not like", value, "auditPrintFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditPrintFlagIn(List<String> values) {
+            addCriterion("audit_print_flag in", values, "auditPrintFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditPrintFlagNotIn(List<String> values) {
+            addCriterion("audit_print_flag not in", values, "auditPrintFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditPrintFlagBetween(String value1, String value2) {
+            addCriterion("audit_print_flag between", value1, value2, "auditPrintFlag");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuditPrintFlagNotBetween(String value1, String value2) {
+            addCriterion("audit_print_flag not between", value1, value2, "auditPrintFlag");
+            return (Criteria) this;
+        }
+
         public Criteria andTenantIdIsNull() {
             addCriterion("tenant_id is null");
             return (Criteria) this;
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigService.java
index 65243b957..b7f3170f6 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigService.java
@@ -508,20 +508,20 @@ public class SystemConfigService {
     }
 
     /**
-     * 获取移动平均价开关
+     * 获取先审核后打印开关
      * @return
      * @throws Exception
      */
-    public boolean getMoveAvgPriceFlag() throws Exception {
-        boolean moveAvgPriceFlag = false;
+    public boolean getAuditPrintFlag() throws Exception {
+        boolean auditPrintFlag = false;
         List<SystemConfig> list = getSystemConfig();
         if(list.size()>0) {
-            String flag = list.get(0).getMoveAvgPriceFlag();
+            String flag = list.get(0).getAuditPrintFlag();
             if(("1").equals(flag)) {
-                moveAvgPriceFlag = true;
+                auditPrintFlag = true;
             }
         }
-        return moveAvgPriceFlag;
+        return auditPrintFlag;
     }
 
     /**
diff --git a/jshERP-boot/src/main/resources/mapper_xml/SystemConfigMapper.xml b/jshERP-boot/src/main/resources/mapper_xml/SystemConfigMapper.xml
deleted file mode 100644
index 8a44c0934..000000000
--- a/jshERP-boot/src/main/resources/mapper_xml/SystemConfigMapper.xml
+++ /dev/null
@@ -1,484 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jsh.erp.datasource.mappers.SystemConfigMapper">
-  <resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.SystemConfig">
-    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="company_name" jdbcType="VARCHAR" property="companyName" />
-    <result column="company_contacts" jdbcType="VARCHAR" property="companyContacts" />
-    <result column="company_address" jdbcType="VARCHAR" property="companyAddress" />
-    <result column="company_tel" jdbcType="VARCHAR" property="companyTel" />
-    <result column="company_fax" jdbcType="VARCHAR" property="companyFax" />
-    <result column="company_post_code" jdbcType="VARCHAR" property="companyPostCode" />
-    <result column="sale_agreement" jdbcType="VARCHAR" property="saleAgreement" />
-    <result column="depot_flag" jdbcType="VARCHAR" property="depotFlag" />
-    <result column="customer_flag" jdbcType="VARCHAR" property="customerFlag" />
-    <result column="minus_stock_flag" jdbcType="VARCHAR" property="minusStockFlag" />
-    <result column="purchase_by_sale_flag" jdbcType="VARCHAR" property="purchaseBySaleFlag" />
-    <result column="multi_level_approval_flag" jdbcType="VARCHAR" property="multiLevelApprovalFlag" />
-    <result column="multi_bill_type" jdbcType="VARCHAR" property="multiBillType" />
-    <result column="force_approval_flag" jdbcType="VARCHAR" property="forceApprovalFlag" />
-    <result column="update_unit_price_flag" jdbcType="VARCHAR" property="updateUnitPriceFlag" />
-    <result column="over_link_bill_flag" jdbcType="VARCHAR" property="overLinkBillFlag" />
-    <result column="in_out_manage_flag" jdbcType="VARCHAR" property="inOutManageFlag" />
-    <result column="multi_account_flag" jdbcType="VARCHAR" property="multiAccountFlag" />
-    <result column="move_avg_price_flag" jdbcType="VARCHAR" property="moveAvgPriceFlag" />
-    <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
-    <result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, company_name, company_contacts, company_address, company_tel, company_fax, company_post_code, 
-    sale_agreement, depot_flag, customer_flag, minus_stock_flag, purchase_by_sale_flag, 
-    multi_level_approval_flag, multi_bill_type, force_approval_flag, update_unit_price_flag, 
-    over_link_bill_flag, in_out_manage_flag, multi_account_flag, move_avg_price_flag, 
-    tenant_id, delete_flag
-  </sql>
-  <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.SystemConfigExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from jsh_system_config
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from jsh_system_config
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from jsh_system_config
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.SystemConfigExample">
-    delete from jsh_system_config
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.jsh.erp.datasource.entities.SystemConfig">
-    insert into jsh_system_config (id, company_name, company_contacts, 
-      company_address, company_tel, company_fax, 
-      company_post_code, sale_agreement, depot_flag, 
-      customer_flag, minus_stock_flag, purchase_by_sale_flag, 
-      multi_level_approval_flag, multi_bill_type, 
-      force_approval_flag, update_unit_price_flag, 
-      over_link_bill_flag, in_out_manage_flag, multi_account_flag, 
-      move_avg_price_flag, tenant_id, delete_flag
-      )
-    values (#{id,jdbcType=BIGINT}, #{companyName,jdbcType=VARCHAR}, #{companyContacts,jdbcType=VARCHAR}, 
-      #{companyAddress,jdbcType=VARCHAR}, #{companyTel,jdbcType=VARCHAR}, #{companyFax,jdbcType=VARCHAR}, 
-      #{companyPostCode,jdbcType=VARCHAR}, #{saleAgreement,jdbcType=VARCHAR}, #{depotFlag,jdbcType=VARCHAR}, 
-      #{customerFlag,jdbcType=VARCHAR}, #{minusStockFlag,jdbcType=VARCHAR}, #{purchaseBySaleFlag,jdbcType=VARCHAR}, 
-      #{multiLevelApprovalFlag,jdbcType=VARCHAR}, #{multiBillType,jdbcType=VARCHAR}, 
-      #{forceApprovalFlag,jdbcType=VARCHAR}, #{updateUnitPriceFlag,jdbcType=VARCHAR}, 
-      #{overLinkBillFlag,jdbcType=VARCHAR}, #{inOutManageFlag,jdbcType=VARCHAR}, #{multiAccountFlag,jdbcType=VARCHAR}, 
-      #{moveAvgPriceFlag,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.SystemConfig">
-    insert into jsh_system_config
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="companyName != null">
-        company_name,
-      </if>
-      <if test="companyContacts != null">
-        company_contacts,
-      </if>
-      <if test="companyAddress != null">
-        company_address,
-      </if>
-      <if test="companyTel != null">
-        company_tel,
-      </if>
-      <if test="companyFax != null">
-        company_fax,
-      </if>
-      <if test="companyPostCode != null">
-        company_post_code,
-      </if>
-      <if test="saleAgreement != null">
-        sale_agreement,
-      </if>
-      <if test="depotFlag != null">
-        depot_flag,
-      </if>
-      <if test="customerFlag != null">
-        customer_flag,
-      </if>
-      <if test="minusStockFlag != null">
-        minus_stock_flag,
-      </if>
-      <if test="purchaseBySaleFlag != null">
-        purchase_by_sale_flag,
-      </if>
-      <if test="multiLevelApprovalFlag != null">
-        multi_level_approval_flag,
-      </if>
-      <if test="multiBillType != null">
-        multi_bill_type,
-      </if>
-      <if test="forceApprovalFlag != null">
-        force_approval_flag,
-      </if>
-      <if test="updateUnitPriceFlag != null">
-        update_unit_price_flag,
-      </if>
-      <if test="overLinkBillFlag != null">
-        over_link_bill_flag,
-      </if>
-      <if test="inOutManageFlag != null">
-        in_out_manage_flag,
-      </if>
-      <if test="multiAccountFlag != null">
-        multi_account_flag,
-      </if>
-      <if test="moveAvgPriceFlag != null">
-        move_avg_price_flag,
-      </if>
-      <if test="tenantId != null">
-        tenant_id,
-      </if>
-      <if test="deleteFlag != null">
-        delete_flag,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=BIGINT},
-      </if>
-      <if test="companyName != null">
-        #{companyName,jdbcType=VARCHAR},
-      </if>
-      <if test="companyContacts != null">
-        #{companyContacts,jdbcType=VARCHAR},
-      </if>
-      <if test="companyAddress != null">
-        #{companyAddress,jdbcType=VARCHAR},
-      </if>
-      <if test="companyTel != null">
-        #{companyTel,jdbcType=VARCHAR},
-      </if>
-      <if test="companyFax != null">
-        #{companyFax,jdbcType=VARCHAR},
-      </if>
-      <if test="companyPostCode != null">
-        #{companyPostCode,jdbcType=VARCHAR},
-      </if>
-      <if test="saleAgreement != null">
-        #{saleAgreement,jdbcType=VARCHAR},
-      </if>
-      <if test="depotFlag != null">
-        #{depotFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="customerFlag != null">
-        #{customerFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="minusStockFlag != null">
-        #{minusStockFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="purchaseBySaleFlag != null">
-        #{purchaseBySaleFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="multiLevelApprovalFlag != null">
-        #{multiLevelApprovalFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="multiBillType != null">
-        #{multiBillType,jdbcType=VARCHAR},
-      </if>
-      <if test="forceApprovalFlag != null">
-        #{forceApprovalFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="updateUnitPriceFlag != null">
-        #{updateUnitPriceFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="overLinkBillFlag != null">
-        #{overLinkBillFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="inOutManageFlag != null">
-        #{inOutManageFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="multiAccountFlag != null">
-        #{multiAccountFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="moveAvgPriceFlag != null">
-        #{moveAvgPriceFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="tenantId != null">
-        #{tenantId,jdbcType=BIGINT},
-      </if>
-      <if test="deleteFlag != null">
-        #{deleteFlag,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.SystemConfigExample" resultType="java.lang.Long">
-    select count(*) from jsh_system_config
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update jsh_system_config
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=BIGINT},
-      </if>
-      <if test="record.companyName != null">
-        company_name = #{record.companyName,jdbcType=VARCHAR},
-      </if>
-      <if test="record.companyContacts != null">
-        company_contacts = #{record.companyContacts,jdbcType=VARCHAR},
-      </if>
-      <if test="record.companyAddress != null">
-        company_address = #{record.companyAddress,jdbcType=VARCHAR},
-      </if>
-      <if test="record.companyTel != null">
-        company_tel = #{record.companyTel,jdbcType=VARCHAR},
-      </if>
-      <if test="record.companyFax != null">
-        company_fax = #{record.companyFax,jdbcType=VARCHAR},
-      </if>
-      <if test="record.companyPostCode != null">
-        company_post_code = #{record.companyPostCode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.saleAgreement != null">
-        sale_agreement = #{record.saleAgreement,jdbcType=VARCHAR},
-      </if>
-      <if test="record.depotFlag != null">
-        depot_flag = #{record.depotFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="record.customerFlag != null">
-        customer_flag = #{record.customerFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="record.minusStockFlag != null">
-        minus_stock_flag = #{record.minusStockFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="record.purchaseBySaleFlag != null">
-        purchase_by_sale_flag = #{record.purchaseBySaleFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="record.multiLevelApprovalFlag != null">
-        multi_level_approval_flag = #{record.multiLevelApprovalFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="record.multiBillType != null">
-        multi_bill_type = #{record.multiBillType,jdbcType=VARCHAR},
-      </if>
-      <if test="record.forceApprovalFlag != null">
-        force_approval_flag = #{record.forceApprovalFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="record.updateUnitPriceFlag != null">
-        update_unit_price_flag = #{record.updateUnitPriceFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="record.overLinkBillFlag != null">
-        over_link_bill_flag = #{record.overLinkBillFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="record.inOutManageFlag != null">
-        in_out_manage_flag = #{record.inOutManageFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="record.multiAccountFlag != null">
-        multi_account_flag = #{record.multiAccountFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="record.moveAvgPriceFlag != null">
-        move_avg_price_flag = #{record.moveAvgPriceFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="record.tenantId != null">
-        tenant_id = #{record.tenantId,jdbcType=BIGINT},
-      </if>
-      <if test="record.deleteFlag != null">
-        delete_flag = #{record.deleteFlag,jdbcType=VARCHAR},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update jsh_system_config
-    set id = #{record.id,jdbcType=BIGINT},
-      company_name = #{record.companyName,jdbcType=VARCHAR},
-      company_contacts = #{record.companyContacts,jdbcType=VARCHAR},
-      company_address = #{record.companyAddress,jdbcType=VARCHAR},
-      company_tel = #{record.companyTel,jdbcType=VARCHAR},
-      company_fax = #{record.companyFax,jdbcType=VARCHAR},
-      company_post_code = #{record.companyPostCode,jdbcType=VARCHAR},
-      sale_agreement = #{record.saleAgreement,jdbcType=VARCHAR},
-      depot_flag = #{record.depotFlag,jdbcType=VARCHAR},
-      customer_flag = #{record.customerFlag,jdbcType=VARCHAR},
-      minus_stock_flag = #{record.minusStockFlag,jdbcType=VARCHAR},
-      purchase_by_sale_flag = #{record.purchaseBySaleFlag,jdbcType=VARCHAR},
-      multi_level_approval_flag = #{record.multiLevelApprovalFlag,jdbcType=VARCHAR},
-      multi_bill_type = #{record.multiBillType,jdbcType=VARCHAR},
-      force_approval_flag = #{record.forceApprovalFlag,jdbcType=VARCHAR},
-      update_unit_price_flag = #{record.updateUnitPriceFlag,jdbcType=VARCHAR},
-      over_link_bill_flag = #{record.overLinkBillFlag,jdbcType=VARCHAR},
-      in_out_manage_flag = #{record.inOutManageFlag,jdbcType=VARCHAR},
-      multi_account_flag = #{record.multiAccountFlag,jdbcType=VARCHAR},
-      move_avg_price_flag = #{record.moveAvgPriceFlag,jdbcType=VARCHAR},
-      tenant_id = #{record.tenantId,jdbcType=BIGINT},
-      delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.SystemConfig">
-    update jsh_system_config
-    <set>
-      <if test="companyName != null">
-        company_name = #{companyName,jdbcType=VARCHAR},
-      </if>
-      <if test="companyContacts != null">
-        company_contacts = #{companyContacts,jdbcType=VARCHAR},
-      </if>
-      <if test="companyAddress != null">
-        company_address = #{companyAddress,jdbcType=VARCHAR},
-      </if>
-      <if test="companyTel != null">
-        company_tel = #{companyTel,jdbcType=VARCHAR},
-      </if>
-      <if test="companyFax != null">
-        company_fax = #{companyFax,jdbcType=VARCHAR},
-      </if>
-      <if test="companyPostCode != null">
-        company_post_code = #{companyPostCode,jdbcType=VARCHAR},
-      </if>
-      <if test="saleAgreement != null">
-        sale_agreement = #{saleAgreement,jdbcType=VARCHAR},
-      </if>
-      <if test="depotFlag != null">
-        depot_flag = #{depotFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="customerFlag != null">
-        customer_flag = #{customerFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="minusStockFlag != null">
-        minus_stock_flag = #{minusStockFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="purchaseBySaleFlag != null">
-        purchase_by_sale_flag = #{purchaseBySaleFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="multiLevelApprovalFlag != null">
-        multi_level_approval_flag = #{multiLevelApprovalFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="multiBillType != null">
-        multi_bill_type = #{multiBillType,jdbcType=VARCHAR},
-      </if>
-      <if test="forceApprovalFlag != null">
-        force_approval_flag = #{forceApprovalFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="updateUnitPriceFlag != null">
-        update_unit_price_flag = #{updateUnitPriceFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="overLinkBillFlag != null">
-        over_link_bill_flag = #{overLinkBillFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="inOutManageFlag != null">
-        in_out_manage_flag = #{inOutManageFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="multiAccountFlag != null">
-        multi_account_flag = #{multiAccountFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="moveAvgPriceFlag != null">
-        move_avg_price_flag = #{moveAvgPriceFlag,jdbcType=VARCHAR},
-      </if>
-      <if test="tenantId != null">
-        tenant_id = #{tenantId,jdbcType=BIGINT},
-      </if>
-      <if test="deleteFlag != null">
-        delete_flag = #{deleteFlag,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.SystemConfig">
-    update jsh_system_config
-    set company_name = #{companyName,jdbcType=VARCHAR},
-      company_contacts = #{companyContacts,jdbcType=VARCHAR},
-      company_address = #{companyAddress,jdbcType=VARCHAR},
-      company_tel = #{companyTel,jdbcType=VARCHAR},
-      company_fax = #{companyFax,jdbcType=VARCHAR},
-      company_post_code = #{companyPostCode,jdbcType=VARCHAR},
-      sale_agreement = #{saleAgreement,jdbcType=VARCHAR},
-      depot_flag = #{depotFlag,jdbcType=VARCHAR},
-      customer_flag = #{customerFlag,jdbcType=VARCHAR},
-      minus_stock_flag = #{minusStockFlag,jdbcType=VARCHAR},
-      purchase_by_sale_flag = #{purchaseBySaleFlag,jdbcType=VARCHAR},
-      multi_level_approval_flag = #{multiLevelApprovalFlag,jdbcType=VARCHAR},
-      multi_bill_type = #{multiBillType,jdbcType=VARCHAR},
-      force_approval_flag = #{forceApprovalFlag,jdbcType=VARCHAR},
-      update_unit_price_flag = #{updateUnitPriceFlag,jdbcType=VARCHAR},
-      over_link_bill_flag = #{overLinkBillFlag,jdbcType=VARCHAR},
-      in_out_manage_flag = #{inOutManageFlag,jdbcType=VARCHAR},
-      multi_account_flag = #{multiAccountFlag,jdbcType=VARCHAR},
-      move_avg_price_flag = #{moveAvgPriceFlag,jdbcType=VARCHAR},
-      tenant_id = #{tenantId,jdbcType=BIGINT},
-      delete_flag = #{deleteFlag,jdbcType=VARCHAR}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-</mapper>
\ No newline at end of file
diff --git a/jshERP-web/src/views/system/SystemConfigList.vue b/jshERP-web/src/views/system/SystemConfigList.vue
index f74844477..4c93e0c1a 100644
--- a/jshERP-web/src/views/system/SystemConfigList.vue
+++ b/jshERP-web/src/views/system/SystemConfigList.vue
@@ -116,8 +116,14 @@
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row class="form-row" :gutter="24" v-if="isShowApproval">
+        <a-row class="form-row" :gutter="24">
           <a-col :lg="12" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="先审核后打印">
+              <a-switch checked-children="启用" un-checked-children="关闭" v-model="auditPrintFlagSwitch" @change="onAuditPrintChange"></a-switch>
+              （启用后，零售、采购、销售、仓库、盘点、财务管理大菜单下的单据，都需要先审核之后才能进行打印）
+            </a-form-item>
+          </a-col>
+          <a-col :lg="12" :md="12" :sm="24" v-if="isShowApproval">
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="多级审核">
               <a-switch checked-children="启用" un-checked-children="关闭" v-model="multiLevelApprovalFlagSwitch" @change="onMultiLevelApprovalChange"></a-switch>
               <a-select placeholder="请选择流程类型" v-model="multiBillTypeSelect" style="width:400px;padding-left:10px"
@@ -130,8 +136,6 @@
               <br/>（启用后，多级审核需配置流程，开启后需刷新浏览器才能看到效果）<a-button type="link" @click="handleReload">点此刷新</a-button>
             </a-form-item>
           </a-col>
-          <a-col :lg="12" :md="12" :sm="24">
-          </a-col>
         </a-row>
       </a-form>
     </a-spin>
@@ -173,6 +177,7 @@
         isShowApproval: false, //是否展示多级审核
         multiAccountFlagSwitch: false, //多账户
         moveAvgPriceFlagSwitch: false, //移动平均价
+        auditPrintFlagSwitch: false, //先审核后打印
         labelCol: {
           xs: { span: 24 },
           sm: { span: 5 },
@@ -271,6 +276,9 @@
               if (record.moveAvgPriceFlag != null) {
                 this.moveAvgPriceFlagSwitch = record.moveAvgPriceFlag == '1' ? true : false;
               }
+              if (record.auditPrintFlag != null) {
+                this.auditPrintFlagSwitch = record.auditPrintFlag == '1' ? true : false;
+              }
             }
           } else {
             this.$message.info(res.data);
@@ -391,6 +399,10 @@
         this.model.moveAvgPriceFlag = checked?'1':'0'
         this.handleChange()
       },
+      onAuditPrintChange(checked) {
+        this.model.auditPrintFlag = checked?'1':'0'
+        this.handleChange()
+      },
       //改变内容
       handleChange() {
         this.confirmLoading = true