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-18 15:00:35 +08:00
parent 3da35d3536
commit e2b02a2ccd
7 changed files with 56 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/InspectGoods.java
View File

@ -124,6 +124,10 @@ public class InspectGoods extends BaseEntity {
@ApiModelProperty(value = "备注")
private String remark;
@Excel(name = "附件，多个则逗号分隔")
@ApiModelProperty(value = "附件，多个则逗号分隔")
private String inspectAttachment;
private List<InspectGoodsDetail> inspectGoodsDetails;
}

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/InspectGoodsAdd.java
View File

@ -115,6 +115,10 @@ public class InspectGoodsAdd implements Serializable {
@ApiModelProperty(value = "备注")
private String remark;
@Excel(name = "附件，多个则逗号分隔")
@ApiModelProperty(value = "附件，多个则逗号分隔")
private String inspectAttachment;
private List<InspectGoodsDetailAdd> inspectGoodsDetails;
}

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/InspectGoodsUpdate.java
View File

@ -110,6 +110,10 @@ public class InspectGoodsUpdate implements Serializable {
@ApiModelProperty(value = "备注")
private String remark;
@Excel(name = "附件，多个则逗号分隔")
@ApiModelProperty(value = "附件，多个则逗号分隔")
private String inspectAttachment;
private List<InspectGoodsDetailUpdate> inspectGoodsDetails;
}

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

@ -126,6 +126,13 @@ public class InspectGoodsVO extends BaseEntity {
@ApiModelProperty(value = "区域名称")
private String areaName;
@Excel(name = "附件，多个则逗号分隔")
@ApiModelProperty(value = "附件，多个则逗号分隔")
private String inspectAttachment;
@ApiModelProperty(value = "附件")
private List<String> inspectAttachmentList;
private List<InspectGoodsDetailVO> inspectGoodsDetails;
}

32
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/InspectGoodsServiceImpl.java
View File

@ -8,6 +8,7 @@ import java.util.Objects;
import java.util.stream.Collectors;
import cn.hutool.core.collection.CollUtil;
import com.bonus.canteen.core.common.utils.FileUrlUtil;
import com.bonus.canteen.core.ims.domain.InspectGoodsDetail;
import com.bonus.canteen.core.ims.domain.OrderGoods;
import com.bonus.canteen.core.ims.domain.ProductionPurchaseOrder;
@ -65,6 +66,18 @@ public class InspectGoodsServiceImpl implements IInspectGoodsService {
inspectGoodsDetail.setInspectGoodsId(inspectGoodsId);
List<InspectGoodsDetailVO> inspectGoodsDetails = inspectGoodsDetailService.selectInspectGoodsDetailList(inspectGoodsDetail);
inspectGoodsVO.setInspectGoodsDetails(inspectGoodsDetails);
String inspectAttachments = inspectGoodsVO.getInspectAttachment();
List<String> finalAttachmentList = new ArrayList<>();
if(StringUtils.isNotBlank(inspectAttachments)) {
String[] inspectAttachmentList = StringUtils.split(inspectAttachments, ",");
if(Objects.nonNull(inspectAttachmentList)) {
for(String inspectAttachment : inspectAttachmentList) {
String finalAttachment = FileUrlUtil.getFileUrl(inspectAttachment);
finalAttachmentList.add(finalAttachment);
}
}
}
inspectGoodsVO.setInspectAttachmentList(finalAttachmentList);
}
return inspectGoodsVO;
}
@ -77,7 +90,24 @@ public class InspectGoodsServiceImpl implements IInspectGoodsService {
*/
@Override
public List<InspectGoodsVO> selectInspectGoodsList(InspectGoods inspectGoods) {
return inspectGoodsMapper.selectInspectGoodsList(inspectGoods);
List<InspectGoodsVO> inspectGoodsVOList = inspectGoodsMapper.selectInspectGoodsList(inspectGoods);
if(CollUtil.isNotEmpty(inspectGoodsVOList)) {
inspectGoodsVOList.forEach(inspectGoodsVO -> {
String inspectAttachments = inspectGoodsVO.getInspectAttachment();
List<String> finalAttachmentList = new ArrayList<>();
if(StringUtils.isNotBlank(inspectAttachments)) {
String[] inspectAttachmentList = StringUtils.split(inspectAttachments, ",");
if(Objects.nonNull(inspectAttachmentList)) {
for(String inspectAttachment : inspectAttachmentList) {
String finalAttachment = FileUrlUtil.getFileUrl(inspectAttachment);
finalAttachmentList.add(finalAttachment);
}
}
}
inspectGoodsVO.setInspectAttachmentList(finalAttachmentList);
});
}
return inspectGoodsVOList;
}
/**

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

@ -30,6 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="areaId" column="area_id" />
<result property="deliveryWarehouseName" column="warehouse_name" />
<result property="areaName" column="area_name" />
<result property="inspectAttachment" column="inspect_attachment" />
</resultMap>
<sql id="selectInspectGoodsVo">
@ -39,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
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,
isr.supplier_name as delivery_supplier_name, iig.remark, iwi.warehouse_name,
ba.area_name
ba.area_name, iig.inspect_attachment
from ims_inspect_goods iig
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
@ -101,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="relateOrderGoodsId != null">relate_order_goods_id,</if>
<if test="ifInto != null">if_into,</if>
<if test="signaturePicUrl != null">signature_pic_url,</if>
<if test="inspectAttachment != null">inspect_attachment,</if>
<if test="remark != null">remark,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
@ -124,6 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="relateOrderGoodsId != null">#{relateOrderGoodsId},</if>
<if test="ifInto != null">#{ifInto},</if>
<if test="signaturePicUrl != null">#{signaturePicUrl},</if>
<if test="inspectAttachment != null">#{inspectAttachment},</if>
<if test="remark != null">#{remark},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
@ -151,6 +154,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="relateOrderGoodsId != null">relate_order_goods_id = #{relateOrderGoodsId},</if>
<if test="ifInto != null">if_into = #{ifInto},</if>
<if test="signaturePicUrl != null">signature_pic_url = #{signaturePicUrl},</if>
<if test="inspectAttachment != null">inspect_attachment = #{inspectAttachment},</if>
<if test="remark != null">remark = #{remark},</if>
<!-- <if test="createBy != null">create_by = #{createBy},</if>-->
<!-- <if test="createTime != null">create_time = #{createTime},</if>-->

1
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/OrderGoodsDetailMapper.xml
View File

@ -45,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectOrderGoodsDetailVo"/>
<where>
iogd.del_flag = '0'
<if test="orderGoodsCode != null and orderGoodsCode != ''">and iogd.order_goods_code = #{orderGoodsCode}</if>
<if test="orderGoodsId != null "> and iogd.order_goods_id = #{orderGoodsId}</if>
<if test="materialId != null "> and iogd.material_id = #{materialId}</if>
<if test="unitId != null "> and iogd.unit_id = #{unitId}</if>