aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2025-01-02 22:01:58 +08:00
parent b5bb52cb8b
commit 1f8af927a2
6 changed files with 77 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
View File

@ -499,15 +499,25 @@ public class EmisWaybill extends BaseEntity
@DataAuditField(fieldComment = "扩展信息")
private String extInfo;
// 体积信息
@TableField(exist = false)
private List<EmisWaybillCargo> cargoList;
// 费用列表信息
@TableField(exist = false)
private List<EmisWaybillFeeitem> feeitemList;
// 附件信息
@TableField(exist = false)
private List<EmisWaybillAttachment> attachmentList;
// 快递报关资料信息
@TableField(exist = false)
private List<EmisWaybillDeclareGoods> declareGoodsList;
// 陆运报关附件信息
@TableField(exist = false)
private List<EmisWaybillDeclareAttachment> declareAttachmentList;
/* 扩展信息 */
@TableField(exist = false)

2
emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillDeclareAttachmentMapper.java
View File

@ -85,4 +85,6 @@ public interface EmisWaybillDeclareAttachmentMapper extends BaseMapper<EmisWaybi
public int deleteByBillCodeAndAttachType(@Param("billCode") String billCode, @Param("attachType") String attachType);
public int deleteEmisWaybillDeclareAttachmentByWaybillId(Long waybillId);
}

3
emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillDeclareGoodsMapper.java
View File

@ -77,4 +77,7 @@ public interface EmisWaybillDeclareGoodsMapper extends BaseMapper<EmisWaybillDec
* @return 结果
*/
public int deleteEmisWaybillDeclareGoodsByIds(Long[] ids);
public int deleteEmisWaybillDeclareGoodsByWaybillId(Long waybillId);
}

59
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -84,9 +84,15 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
@Autowired
private EmisWaybillCargoMapper emisWaybillCargoMapper;
@Autowired
private EmisWaybillAttachmentMapper emisWaybillAttachmentMapper;
@Autowired
private EmisWaybillDeclareGoodsMapper emisWaybillDeclareGoodsMapper;
@Autowired
private EmisWaybillDeclareAttachmentMapper emisWaybillDeclareAttachmentMapper;
@Autowired
private EmisTransLineMapper emisTransLineMapper;
@ -2739,15 +2745,35 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
}
}
// 插入商品信息
// 插入件模体信息
if(!CollectionUtil.isEmpty(emisWaybillSave.getCargoList() )){
List<EmisWaybillCargo> cargoList=emisWaybillSave.getCargoList();
for (EmisWaybillCargo cargoItem:cargoList) {
cargoItem.setWaybillId(emisWaybillSave.getId());
cargoItem.setBillCode(emisWaybillSave.getBillCode());
emisWaybillCargoMapper.insertEmisWaybillCargo(cargoItem);
}
}
// 插入申报货物信息
if(!CollectionUtil.isEmpty(emisWaybillSave.getDeclareGoodsList() )){
List<EmisWaybillDeclareGoods> declareGoodsList=emisWaybillSave.getDeclareGoodsList();
for (EmisWaybillDeclareGoods declareGoodsItem:declareGoodsList) {
declareGoodsItem.setWaybillId(emisWaybillSave.getId());
declareGoodsItem.setBillCode(emisWaybillSave.getBillCode());
emisWaybillDeclareGoodsMapper.insertEmisWaybillDeclareGoods(declareGoodsItem);
}
}
// 插入申报资料信息
if(!CollectionUtil.isEmpty(emisWaybillSave.getDeclareAttachmentList() )){
List<EmisWaybillDeclareAttachment> declareAttachmentList=emisWaybillSave.getDeclareAttachmentList();
for (EmisWaybillDeclareAttachment declareAttachmentItem:declareAttachmentList) {
declareAttachmentItem.setWaybillId(emisWaybillSave.getId());
declareAttachmentItem.setBillCode(emisWaybillSave.getBillCode());
emisWaybillDeclareAttachmentMapper.insertEmisWaybillDeclareAttachment(declareAttachmentItem);
}
}
// 通知网点有新的订单
@ -2972,12 +2998,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
}
// 删除旧信息
emisWaybillFeeitemMapper.deleteEmisWaybillFeeitemByWaybillId(emisWaybillSave.getId());
emisWaybillCargoMapper.deleteEmisWaybillCargoByWaybillId(emisWaybillSave.getId());
// 产生主键插入其他数据
// 插入费用
emisWaybillFeeitemMapper.deleteEmisWaybillFeeitemByWaybillId(emisWaybillSave.getId());
List<EmisWaybillFeeitem> feeitemList=emisWaybillSave.getFeeitemList();
if(!CollectionUtils.isEmpty(feeitemList)){
for (EmisWaybillFeeitem feeItem:feeitemList) {
@ -2986,7 +3008,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
}
}
// 插入商品信息
// 插入件模体信息
emisWaybillCargoMapper.deleteEmisWaybillCargoByWaybillId(emisWaybillSave.getId());
if(!CollectionUtil.isEmpty(emisWaybillSave.getCargoList() )){
List<EmisWaybillCargo> cargoList=emisWaybillSave.getCargoList();
for (EmisWaybillCargo cargoItem:cargoList) {
@ -2995,6 +3018,28 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
}
}
// 插入申报货物信息
emisWaybillDeclareGoodsMapper.deleteEmisWaybillDeclareGoodsByWaybillId(emisWaybillSave.getId());
if(!CollectionUtil.isEmpty(emisWaybillSave.getDeclareGoodsList() )){
List<EmisWaybillDeclareGoods> declareGoodsList=emisWaybillSave.getDeclareGoodsList();
for (EmisWaybillDeclareGoods declareGoodsItem:declareGoodsList) {
declareGoodsItem.setWaybillId(emisWaybillSave.getId());
declareGoodsItem.setBillCode(emisWaybillSave.getBillCode());
emisWaybillDeclareGoodsMapper.insertEmisWaybillDeclareGoods(declareGoodsItem);
}
}
// 插入申报资料信息
emisWaybillDeclareAttachmentMapper.deleteEmisWaybillDeclareAttachmentByWaybillId(emisWaybillSave.getId());
if(!CollectionUtil.isEmpty(emisWaybillSave.getDeclareAttachmentList() )){
List<EmisWaybillDeclareAttachment> declareAttachmentList=emisWaybillSave.getDeclareAttachmentList();
for (EmisWaybillDeclareAttachment declareAttachmentItem:declareAttachmentList) {
declareAttachmentItem.setWaybillId(emisWaybillSave.getId());
declareAttachmentItem.setBillCode(emisWaybillSave.getBillCode());
emisWaybillDeclareAttachmentMapper.insertEmisWaybillDeclareAttachment(declareAttachmentItem);
}
}
}

4
emis-biz/src/main/resources/mapper/EmisWaybillDeclareAttachmentMapper.xml
View File

@ -216,4 +216,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update emis_waybill_declare_attachment set del_flag='1' where bill_code = #{billCode} and attach_type = #{attachType}
</delete>
<delete id="deleteEmisWaybillDeclareAttachmentByWaybillId" parameterType="Long">
update emis_waybill_declare_attachment set del_flag='1' where waybill_id = #{waybillId}
</delete>
</mapper>

5
emis-biz/src/main/resources/mapper/EmisWaybillDeclareGoodsMapper.xml
View File

@ -271,4 +271,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
</foreach>
</delete>
<delete id="deleteEmisWaybillDeclareGoodsByWaybillId" parameterType="Long">
update emis_waybill_declare_goods set del_flag='1' where waybill_id = #{waybillId}
</delete>
</mapper>