feat(stock): 库存添加单重
This commit is contained in:
parent
42635073fe
commit
9afd96fe86
|
|
@ -156,6 +156,18 @@ public class Stock extends BaseEntity {
|
||||||
@ExcelExport("保质期")
|
@ExcelExport("保质期")
|
||||||
private Double shelfLife;
|
private Double shelfLife;
|
||||||
|
|
||||||
|
|
||||||
|
@ExcelExport("单重")
|
||||||
|
private Double singleWeight;
|
||||||
|
|
||||||
|
public Double getSingleWeight() {
|
||||||
|
return singleWeight;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSingleWeight(Double singleWeight) {
|
||||||
|
this.singleWeight = singleWeight;
|
||||||
|
}
|
||||||
|
|
||||||
public Stock() {
|
public Stock() {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -27,12 +27,13 @@
|
||||||
<result property="currentLocation" column="current_location"/>
|
<result property="currentLocation" column="current_location"/>
|
||||||
<result property="shelfLife" column="shelf_life"/>
|
<result property="shelfLife" column="shelf_life"/>
|
||||||
<result property="warehouseName" column="warehouse_name"/>
|
<result property="warehouseName" column="warehouse_name"/>
|
||||||
|
<result property="singleWeight" column="single_weight"/>
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<sql id="selectAll">
|
<sql id="selectAll">
|
||||||
select stock_id, warehouse_name, location_id, vehicle_id, goods_id, goods_name, batch_no, available_num, remain_num, real_num, provider_id,
|
select stock_id, warehouse_name, location_id, vehicle_id, goods_id, goods_name, batch_no, available_num, remain_num, real_num, provider_id,
|
||||||
provider_name, production_date, expiration_date, stock_status, goods_status, create_time, last_update_time, last_update_user, remark,
|
provider_name, production_date, expiration_date, stock_status, goods_status, create_time, last_update_time, last_update_user, remark,
|
||||||
is_inventory, inventory_task_id, current_location, shelf_life
|
is_inventory, inventory_task_id, current_location, shelf_life,single_weight
|
||||||
from tbl_app_stock
|
from tbl_app_stock
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
|
|
@ -59,7 +60,7 @@
|
||||||
<select id="selStocksByLocationId" parameterType="string" resultMap="StockMap">
|
<select id="selStocksByLocationId" parameterType="string" resultMap="StockMap">
|
||||||
select stock_id, warehouse_name, location_id, vehicle_id, goods_id, goods_name, batch_no, available_num, remain_num, real_num, provider_id,
|
select stock_id, warehouse_name, location_id, vehicle_id, goods_id, goods_name, batch_no, available_num, remain_num, real_num, provider_id,
|
||||||
provider_name, production_date, expiration_date, stock_status, goods_status, create_time, last_update_time, last_update_user, remark,
|
provider_name, production_date, expiration_date, stock_status, goods_status, create_time, last_update_time, last_update_user, remark,
|
||||||
is_inventory, inventory_task_id, current_location, shelf_life
|
is_inventory, inventory_task_id, current_location, shelf_life,singleWeight
|
||||||
from tbl_app_stock
|
from tbl_app_stock
|
||||||
<where>
|
<where>
|
||||||
<if test="locationId != null and locationId != ''"> and location_id = #{locationId}</if>
|
<if test="locationId != null and locationId != ''"> and location_id = #{locationId}</if>
|
||||||
|
|
@ -112,6 +113,7 @@
|
||||||
<if test="inventoryTaskId != null and inventoryTaskId != ''"> and inventory_task_id = #{inventoryTaskId}</if>
|
<if test="inventoryTaskId != null and inventoryTaskId != ''"> and inventory_task_id = #{inventoryTaskId}</if>
|
||||||
<if test="currentLocation != null and currentLocation != ''"> and current_location = #{currentLocation}</if>
|
<if test="currentLocation != null and currentLocation != ''"> and current_location = #{currentLocation}</if>
|
||||||
<if test="shelfLife != null"> and shelf_life = #{shelfLife}</if>
|
<if test="shelfLife != null"> and shelf_life = #{shelfLife}</if>
|
||||||
|
<if test="singleWeight != null"> and single_weight = #{singleWeight}</if>
|
||||||
</where>
|
</where>
|
||||||
order by goods_status desc, available_num asc , create_time asc
|
order by goods_status desc, available_num asc , create_time asc
|
||||||
</select>
|
</select>
|
||||||
|
|
@ -143,6 +145,7 @@
|
||||||
<if test="inventoryTaskId != null">inventory_task_id,</if>
|
<if test="inventoryTaskId != null">inventory_task_id,</if>
|
||||||
<if test="currentLocation != null">current_location,</if>
|
<if test="currentLocation != null">current_location,</if>
|
||||||
<if test="shelfLife != null">shelf_life,</if>
|
<if test="shelfLife != null">shelf_life,</if>
|
||||||
|
<if test="singleWeight != null"> single_weight</if>
|
||||||
</trim>
|
</trim>
|
||||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||||
<if test="stockId != null">#{stockId},</if>
|
<if test="stockId != null">#{stockId},</if>
|
||||||
|
|
@ -169,6 +172,7 @@
|
||||||
<if test="inventoryTaskId != null">#{inventoryTaskId},</if>
|
<if test="inventoryTaskId != null">#{inventoryTaskId},</if>
|
||||||
<if test="currentLocation != null">#{currentLocation},</if>
|
<if test="currentLocation != null">#{currentLocation},</if>
|
||||||
<if test="shelfLife != null">#{shelfLife},</if>
|
<if test="shelfLife != null">#{shelfLife},</if>
|
||||||
|
<if test="singleWeight != null"> #{singleWeight}</if>
|
||||||
</trim>
|
</trim>
|
||||||
</insert>
|
</insert>
|
||||||
|
|
||||||
|
|
@ -197,6 +201,7 @@
|
||||||
<if test="inventoryTaskId != null">inventory_task_id = #{inventoryTaskId},</if>
|
<if test="inventoryTaskId != null">inventory_task_id = #{inventoryTaskId},</if>
|
||||||
<if test="currentLocation != null">current_location = #{currentLocation},</if>
|
<if test="currentLocation != null">current_location = #{currentLocation},</if>
|
||||||
<if test="shelfLife != null">shelf_life = #{shelfLife},</if>
|
<if test="shelfLife != null">shelf_life = #{shelfLife},</if>
|
||||||
|
<if test="singleWeight != null">single_weight = #{singleWeight},</if>
|
||||||
</trim>
|
</trim>
|
||||||
where stock_id = #{stockId}
|
where stock_id = #{stockId}
|
||||||
</update>
|
</update>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user