bonus
/
Bonus-Cloud-JYY-Smart-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

采购管理

This commit is contained in:
gaowdong 2025-07-17 17:24:47 +08:00
parent 85319380fe
commit 43c0a7d18e
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/vo/InspectGoodsVO.java
View File

@ -120,6 +120,12 @@ public class InspectGoodsVO extends BaseEntity {
@ApiModelProperty(value = "备注") @ApiModelProperty(value = "备注")
private String remark; private String remark;
@ApiModelProperty(value = "仓库名称")
private String deliveryWarehouseName;
@ApiModelProperty(value = "区域名称")
private String areaName;
private List<InspectGoodsDetailVO> inspectGoodsDetails; private List<InspectGoodsDetailVO> inspectGoodsDetails;
} }

10
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/InspectGoodsMapper.xml
View File

@ -28,6 +28,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateTime" column="update_time" /> <result property="updateTime" column="update_time" />
<result property="deliverySupplierName" column="delivery_supplier_name" /> <result property="deliverySupplierName" column="delivery_supplier_name" />
<result property="areaId" column="area_id" /> <result property="areaId" column="area_id" />
<result property="deliveryWarehouseName" column="warehouse_name" />
<result property="areaName" column="area_name" />
</resultMap> </resultMap>
<sql id="selectInspectGoodsVo"> <sql id="selectInspectGoodsVo">
@ -36,10 +38,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
delivery_warehouse_id, delivery_total_num, delivery_date, inspect_qualified_num, delivery_warehouse_id, delivery_total_num, delivery_date, inspect_qualified_num,
total_qualified_num, relate_order_goods_id, if_into, signature_pic_url, total_qualified_num, relate_order_goods_id, if_into, signature_pic_url,
iig.create_by, iig.create_time, iig.update_by, iig.update_time, iwi.area_id, iig.create_by, iig.create_time, iig.update_by, iig.update_time, iwi.area_id,
isr.supplier_name as delivery_supplier_name, iig.remark isr.supplier_name as delivery_supplier_name, iig.remark, iwi.warehouse_name,
ba.area_name
from ims_inspect_goods iig from ims_inspect_goods iig
left join ims_supplier isr on isr.supplier_id = iig.delivery_supplier_id left join ims_supplier isr on isr.supplier_id = iig.delivery_supplier_id
left join ims_warehouse_info iwi on iwi.warehouse_id = iig.delivery_warehouse_id left join ims_warehouse_info iwi on iwi.warehouse_id = iig.delivery_warehouse_id
left join basic_area ba on iwi.area_id = ba.area_id
</sql> </sql>
<select id="selectInspectGoodsList" parameterType="com.bonus.canteen.core.ims.domain.InspectGoods" resultMap="InspectGoodsResult"> <select id="selectInspectGoodsList" parameterType="com.bonus.canteen.core.ims.domain.InspectGoods" resultMap="InspectGoodsResult">
@ -83,7 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="inspectGoodsCode != null">inspect_goods_code,</if> <if test="inspectGoodsCode != null">inspect_goods_code,</if>
<if test="inspectDate != null">inspect_date,</if> <if test="inspectDate != null">inspect_date,</if>
<if test="inspector != null and inspector != ''">inspector,</if> <if test="inspector != null">inspector,</if>
<if test="status != null">status,</if> <if test="status != null">status,</if>
<if test="relateDeliveryGoodsId != null">relate_delivery_goods_id,</if> <if test="relateDeliveryGoodsId != null">relate_delivery_goods_id,</if>
<if test="deliverySupplierId != null">delivery_supplier_id,</if> <if test="deliverySupplierId != null">delivery_supplier_id,</if>
@ -106,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="inspectGoodsCode != null">#{inspectGoodsCode},</if> <if test="inspectGoodsCode != null">#{inspectGoodsCode},</if>
<if test="inspectDate != null">#{inspectDate},</if> <if test="inspectDate != null">#{inspectDate},</if>
<if test="inspector != null and inspector != ''">#{inspector},</if> <if test="inspector != null">#{inspector},</if>
<if test="status != null">#{status},</if> <if test="status != null">#{status},</if>
<if test="relateDeliveryGoodsId != null">#{relateDeliveryGoodsId},</if> <if test="relateDeliveryGoodsId != null">#{relateDeliveryGoodsId},</if>
<if test="deliverySupplierId != null">#{deliverySupplierId},</if> <if test="deliverySupplierId != null">#{deliverySupplierId},</if>