增加销售订单与采购订单的关联

2022-05-18 00:21:15 +08:00
parent 14d5c5247d
commit 3438524a47
12 changed files with 305 additions and 35 deletions
--- a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapper.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapper.xml
@@ -27,6 +27,7 @@
    <result column="discount_last_money" jdbcType="DECIMAL" property="discountLastMoney" />
    <result column="other_money" jdbcType="DECIMAL" property="otherMoney" />
    <result column="status" jdbcType="VARCHAR" property="status" />
+    <result column="purchase_status" jdbcType="VARCHAR" property="purchaseStatus" />
    <result column="link_number" jdbcType="VARCHAR" property="linkNumber" />
    <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
    <result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
@@ -93,7 +94,8 @@
    id, type, sub_type, default_number, number, create_time, oper_time, organ_id, creator, 
    account_id, change_amount, back_amount, total_price, pay_type, bill_type, remark, 
    file_name, sales_man, account_id_list, account_money_list, discount, discount_money, 
-    discount_last_money, other_money, status, link_number, tenant_id, delete_flag
+    discount_last_money, other_money, status, purchase_status, link_number, tenant_id, 
+    delete_flag
  </sql>
  <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample" resultMap="BaseResultMap">
    select
@@ -134,8 +136,8 @@
      remark, file_name, sales_man, 
      account_id_list, account_money_list, discount, 
      discount_money, discount_last_money, other_money, 
-      status, link_number, tenant_id, 
-      delete_flag)
+      status, purchase_status, link_number, 
+      tenant_id, delete_flag)
    values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{subType,jdbcType=VARCHAR}, 
      #{defaultNumber,jdbcType=VARCHAR}, #{number,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
      #{operTime,jdbcType=TIMESTAMP}, #{organId,jdbcType=BIGINT}, #{creator,jdbcType=BIGINT}, 
@@ -144,8 +146,8 @@
      #{remark,jdbcType=VARCHAR}, #{fileName,jdbcType=VARCHAR}, #{salesMan,jdbcType=VARCHAR}, 
      #{accountIdList,jdbcType=VARCHAR}, #{accountMoneyList,jdbcType=VARCHAR}, #{discount,jdbcType=DECIMAL}, 
      #{discountMoney,jdbcType=DECIMAL}, #{discountLastMoney,jdbcType=DECIMAL}, #{otherMoney,jdbcType=DECIMAL}, 
-      #{status,jdbcType=VARCHAR}, #{linkNumber,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, 
-      #{deleteFlag,jdbcType=VARCHAR})
+      #{status,jdbcType=VARCHAR}, #{purchaseStatus,jdbcType=VARCHAR}, #{linkNumber,jdbcType=VARCHAR}, 
+      #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR})
  </insert>
  <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.DepotHead">
    insert into jsh_depot_head
@@ -225,6 +227,9 @@
      <if test="status != null">
        status,
      </if>
+      <if test="purchaseStatus != null">
+        purchase_status,
+      </if>
      <if test="linkNumber != null">
        link_number,
      </if>
@@ -311,6 +316,9 @@
      <if test="status != null">
        #{status,jdbcType=VARCHAR},
      </if>
+      <if test="purchaseStatus != null">
+        #{purchaseStatus,jdbcType=VARCHAR},
+      </if>
      <if test="linkNumber != null">
        #{linkNumber,jdbcType=VARCHAR},
      </if>
@@ -406,6 +414,9 @@
      <if test="record.status != null">
        status = #{record.status,jdbcType=VARCHAR},
      </if>
+      <if test="record.purchaseStatus != null">
+        purchase_status = #{record.purchaseStatus,jdbcType=VARCHAR},
+      </if>
      <if test="record.linkNumber != null">
        link_number = #{record.linkNumber,jdbcType=VARCHAR},
      </if>
@@ -447,6 +458,7 @@
      discount_last_money = #{record.discountLastMoney,jdbcType=DECIMAL},
      other_money = #{record.otherMoney,jdbcType=DECIMAL},
      status = #{record.status,jdbcType=VARCHAR},
+      purchase_status = #{record.purchaseStatus,jdbcType=VARCHAR},
      link_number = #{record.linkNumber,jdbcType=VARCHAR},
      tenant_id = #{record.tenantId,jdbcType=BIGINT},
      delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
@@ -529,6 +541,9 @@
      <if test="status != null">
        status = #{status,jdbcType=VARCHAR},
      </if>
+      <if test="purchaseStatus != null">
+        purchase_status = #{purchaseStatus,jdbcType=VARCHAR},
+      </if>
      <if test="linkNumber != null">
        link_number = #{linkNumber,jdbcType=VARCHAR},
      </if>
@@ -567,6 +582,7 @@
      discount_last_money = #{discountLastMoney,jdbcType=DECIMAL},
      other_money = #{otherMoney,jdbcType=DECIMAL},
      status = #{status,jdbcType=VARCHAR},
+      purchase_status = #{purchaseStatus,jdbcType=VARCHAR},
      link_number = #{linkNumber,jdbcType=VARCHAR},
      tenant_id = #{tenantId,jdbcType=BIGINT},
      delete_flag = #{deleteFlag,jdbcType=VARCHAR}
--- a/jshERP-boot/src/main/resources/mapper_xml/SystemConfigMapper.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/SystemConfigMapper.xml
@@ -13,6 +13,7 @@
    <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="tenant_id" jdbcType="BIGINT" property="tenantId" />
    <result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
  </resultMap>
@@ -76,7 +77,8 @@
  </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, tenant_id, delete_flag
+    sale_agreement, depot_flag, customer_flag, minus_stock_flag, purchase_by_sale_flag, 
+    tenant_id, delete_flag
  </sql>
  <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.SystemConfigExample" resultMap="BaseResultMap">
    select
@@ -112,13 +114,13 @@
    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, tenant_id, 
-      delete_flag)
+      customer_flag, minus_stock_flag, purchase_by_sale_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}, #{tenantId,jdbcType=BIGINT}, 
-      #{deleteFlag,jdbcType=VARCHAR})
+      #{customerFlag,jdbcType=VARCHAR}, #{minusStockFlag,jdbcType=VARCHAR}, #{purchaseBySaleFlag,jdbcType=VARCHAR}, 
+      #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR})
  </insert>
  <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.SystemConfig">
    insert into jsh_system_config
@@ -156,6 +158,9 @@
      <if test="minusStockFlag != null">
        minus_stock_flag,
      </if>
+      <if test="purchaseBySaleFlag != null">
+        purchase_by_sale_flag,
+      </if>
      <if test="tenantId != null">
        tenant_id,
      </if>
@@ -197,6 +202,9 @@
      <if test="minusStockFlag != null">
        #{minusStockFlag,jdbcType=VARCHAR},
      </if>
+      <if test="purchaseBySaleFlag != null">
+        #{purchaseBySaleFlag,jdbcType=VARCHAR},
+      </if>
      <if test="tenantId != null">
        #{tenantId,jdbcType=BIGINT},
      </if>
@@ -247,6 +255,9 @@
      <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.tenantId != null">
        tenant_id = #{record.tenantId,jdbcType=BIGINT},
      </if>
@@ -271,6 +282,7 @@
      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},
      tenant_id = #{record.tenantId,jdbcType=BIGINT},
      delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
    <if test="_parameter != null">
@@ -310,6 +322,9 @@
      <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="tenantId != null">
        tenant_id = #{tenantId,jdbcType=BIGINT},
      </if>
@@ -331,6 +346,7 @@
      depot_flag = #{depotFlag,jdbcType=VARCHAR},
      customer_flag = #{customerFlag,jdbcType=VARCHAR},
      minus_stock_flag = #{minusStockFlag,jdbcType=VARCHAR},
+      purchase_by_sale_flag = #{purchaseBySaleFlag,jdbcType=VARCHAR},
      tenant_id = #{tenantId,jdbcType=BIGINT},
      delete_flag = #{deleteFlag,jdbcType=VARCHAR}
    where id = #{id,jdbcType=BIGINT}