修改耗材库存

2024-06-28 09:39:14 +08:00
parent e91636a188
commit 75ec8fc9e5
36 changed files with 788 additions and 83 deletions
--- a/src/main/resources/mapper/TbConsInfoMapper.xml
+++ b/src/main/resources/mapper/TbConsInfoMapper.xml
@@ -10,14 +10,14 @@
    <result column="con_name" jdbcType="VARCHAR" property="conName" />
    <result column="stock_number" jdbcType="DECIMAL" property="stockNumber" />
    <result column="con_unit" jdbcType="VARCHAR" property="conUnit" />
-    <result column="surplus_stock" jdbcType="DECIMAL" property="surplusStock" />
    <result column="laster_in_stock" jdbcType="DECIMAL" property="lasterInStock" />
+    <result column="con_warning" jdbcType="DECIMAL" property="conWarning" />
    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
  </resultMap>
  <sql id="Base_Column_List">
    id, shop_id, con_type_id, con_type_name, con_code, con_name, stock_number, con_unit, 
-    surplus_stock, laster_in_stock, create_time, update_time
+    laster_in_stock, con_warning, create_time, update_time
  </sql>
  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
    select 
@@ -32,13 +32,13 @@
  <insert id="insert" parameterType="com.chaozhanggui.system.cashierservice.entity.TbConsInfo">
    insert into tb_cons_info (id, shop_id, con_type_id, 
      con_type_name, con_code, con_name, 
-      stock_number, con_unit, surplus_stock, 
-      laster_in_stock, create_time, update_time
+      stock_number, con_unit, laster_in_stock, 
+      con_warning, create_time, update_time
      )
    values (#{id,jdbcType=INTEGER}, #{shopId,jdbcType=INTEGER}, #{conTypeId,jdbcType=INTEGER}, 
      #{conTypeName,jdbcType=VARCHAR}, #{conCode,jdbcType=VARCHAR}, #{conName,jdbcType=VARCHAR}, 
-      #{stockNumber,jdbcType=DECIMAL}, #{conUnit,jdbcType=VARCHAR}, #{surplusStock,jdbcType=DECIMAL}, 
-      #{lasterInStock,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
+      #{stockNumber,jdbcType=DECIMAL}, #{conUnit,jdbcType=VARCHAR}, #{lasterInStock,jdbcType=DECIMAL}, 
+      #{conWarning,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
      )
  </insert>
  <insert id="insertSelective" parameterType="com.chaozhanggui.system.cashierservice.entity.TbConsInfo">
@@ -68,12 +68,12 @@
      <if test="conUnit != null">
        con_unit,
      </if>
-      <if test="surplusStock != null">
-        surplus_stock,
-      </if>
      <if test="lasterInStock != null">
        laster_in_stock,
      </if>
+      <if test="conWarning != null">
+        con_warning,
+      </if>
      <if test="createTime != null">
        create_time,
      </if>
@@ -106,12 +106,12 @@
      <if test="conUnit != null">
        #{conUnit,jdbcType=VARCHAR},
      </if>
-      <if test="surplusStock != null">
-        #{surplusStock,jdbcType=DECIMAL},
-      </if>
      <if test="lasterInStock != null">
        #{lasterInStock,jdbcType=DECIMAL},
      </if>
+      <if test="conWarning != null">
+        #{conWarning,jdbcType=DECIMAL},
+      </if>
      <if test="createTime != null">
        #{createTime,jdbcType=TIMESTAMP},
      </if>
@@ -144,12 +144,12 @@
      <if test="conUnit != null">
        con_unit = #{conUnit,jdbcType=VARCHAR},
      </if>
-      <if test="surplusStock != null">
-        surplus_stock = #{surplusStock,jdbcType=DECIMAL},
-      </if>
      <if test="lasterInStock != null">
        laster_in_stock = #{lasterInStock,jdbcType=DECIMAL},
      </if>
+      <if test="conWarning != null">
+        con_warning = #{conWarning,jdbcType=DECIMAL},
+      </if>
      <if test="createTime != null">
        create_time = #{createTime,jdbcType=TIMESTAMP},
      </if>
@@ -168,13 +168,21 @@
      con_name = #{conName,jdbcType=VARCHAR},
      stock_number = #{stockNumber,jdbcType=DECIMAL},
      con_unit = #{conUnit,jdbcType=VARCHAR},
-      surplus_stock = #{surplusStock,jdbcType=DECIMAL},
      laster_in_stock = #{lasterInStock,jdbcType=DECIMAL},
+      con_warning = #{conWarning,jdbcType=DECIMAL},
      create_time = #{createTime,jdbcType=TIMESTAMP},
      update_time = #{updateTime,jdbcType=TIMESTAMP}
    where id = #{id,jdbcType=INTEGER}
  </update>

+  <select id="countAll" resultType="int">
+    select count(id) from tb_cons_info
+  </select>
+
+  <select id="selectAllInfo" resultType="com.chaozhanggui.system.cashierservice.entity.TbConsInfo">
+    select * from tb_cons_info order by id desc
+  </select>
+

  <update id="batchStock">
    <foreach collection="list" item="item" index="index" open="" close="" separator=";">
--- a/src/main/resources/mapper/TbProductMapper.xml
+++ b/src/main/resources/mapper/TbProductMapper.xml
@@ -935,4 +935,29 @@
    set stock_number = stock_number - #{number,jdbcType=INTEGER}
    where id = #{productId}
  </update>
+
+  <select id="selectBySkuId" resultType="com.chaozhanggui.system.cashierservice.entity.po.ProConsSkuInfo">
+    SELECT
+      c.shop_id,
+      c.product_sku_id,
+      c.`status`,
+      i.id as con_id,
+      i.con_code,
+      i.con_name,
+      i.surplus_stock,
+      i.stock_number,
+      p.id as product_id,
+      p.`name` as product_name,
+      i.con_warning,
+      s.spec_snap
+    FROM
+      tb_prosku_con c
+        LEFT JOIN tb_cons_info i ON c.con_info_id = i.id
+        left join tb_product_sku s on c.product_sku_id=s.id
+        left join tb_product p on s.product_id=p.id
+    where c.`status`=1
+      and c.product_sku_id=#{skuId}
+    group by i.id
+    order by i.id
+    </select>
 </mapper>
--- a/src/main/resources/mapper/TbProskuConMapper.xml
+++ b/src/main/resources/mapper/TbProskuConMapper.xml
@@ -6,11 +6,12 @@
    <result column="shop_id" jdbcType="INTEGER" property="shopId" />
    <result column="product_sku_id" jdbcType="INTEGER" property="productSkuId" />
    <result column="con_info_id" jdbcType="INTEGER" property="conInfoId" />
+    <result column="surplus_stock" jdbcType="DECIMAL" property="surplusStock" />
    <result column="status" jdbcType="VARCHAR" property="status" />
    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
  </resultMap>
  <sql id="Base_Column_List">
-    id, shop_id, product_sku_id, con_info_id, status, create_time
+    id, shop_id, product_sku_id, con_info_id, surplus_stock, status, create_time
  </sql>
  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
    select 
@@ -24,11 +25,11 @@
  </delete>
  <insert id="insert" parameterType="com.chaozhanggui.system.cashierservice.entity.TbProskuCon">
    insert into tb_prosku_con (id, shop_id, product_sku_id, 
-      con_info_id, status, create_time
-      )
+      con_info_id, surplus_stock, status, 
+      create_time)
    values (#{id,jdbcType=INTEGER}, #{shopId,jdbcType=INTEGER}, #{productSkuId,jdbcType=INTEGER}, 
-      #{conInfoId,jdbcType=INTEGER}, #{status,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}
-      )
+      #{conInfoId,jdbcType=INTEGER}, #{surplusStock,jdbcType=DECIMAL}, #{status,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP})
  </insert>
  <insert id="insertSelective" parameterType="com.chaozhanggui.system.cashierservice.entity.TbProskuCon">
    insert into tb_prosku_con
@@ -45,6 +46,9 @@
      <if test="conInfoId != null">
        con_info_id,
      </if>
+      <if test="surplusStock != null">
+        surplus_stock,
+      </if>
      <if test="status != null">
        status,
      </if>
@@ -65,6 +69,9 @@
      <if test="conInfoId != null">
        #{conInfoId,jdbcType=INTEGER},
      </if>
+      <if test="surplusStock != null">
+        #{surplusStock,jdbcType=DECIMAL},
+      </if>
      <if test="status != null">
        #{status,jdbcType=VARCHAR},
      </if>
@@ -85,6 +92,9 @@
      <if test="conInfoId != null">
        con_info_id = #{conInfoId,jdbcType=INTEGER},
      </if>
+      <if test="surplusStock != null">
+        surplus_stock = #{surplusStock,jdbcType=DECIMAL},
+      </if>
      <if test="status != null">
        status = #{status,jdbcType=VARCHAR},
      </if>
@@ -99,12 +109,28 @@
    set shop_id = #{shopId,jdbcType=INTEGER},
      product_sku_id = #{productSkuId,jdbcType=INTEGER},
      con_info_id = #{conInfoId,jdbcType=INTEGER},
+      surplus_stock = #{surplusStock,jdbcType=DECIMAL},
      status = #{status,jdbcType=VARCHAR},
      create_time = #{createTime,jdbcType=TIMESTAMP}
    where id = #{id,jdbcType=INTEGER}
  </update>

+
+
+
  <select id="selectBySkuIdAndShopId" resultMap="BaseResultMap">
    select * from tb_prosku_con where product_sku_id=#{shopId} and shop_id=#{shopId} and status=1
-    </select>
+  </select>
+
+  <select id="selectIdBySkuIdAndShopId" resultType="java.lang.Integer">
+    SELECT
+      p.con_info_id
+    FROM
+      tb_prosku_con p
+    WHERE
+      p.shop_id = #{shopId}
+      AND p.product_sku_id = #{skuId}
+      AND p.`status` = 1
+    group by p.con_info_id
+  </select>
 </mapper>