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 2024-06-27 09:40:56 +08:00
parent 6f09e960e5
commit d5b882576c
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
View File

@ -1,5 +1,6 @@
package com.xdadan.erp.emis.domain.vo; package com.xdadan.erp.emis.domain.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.xdadan.erp.emis.domain.EmisWaybill; import com.xdadan.erp.emis.domain.EmisWaybill;
import com.xdadan.erp.emis.domain.EmisWaybillAttachment; import com.xdadan.erp.emis.domain.EmisWaybillAttachment;
@ -258,12 +259,14 @@ public class WaybillOrder implements Serializable {
/* 揽收图片备注 */ /* 揽收图片备注 */
private String billPicSendRmk; private String billPicSendRmk;
/* 签收底单图片 */ /* 派件签收底单图片 */
private String billPicDispatchRmk; private String billPicDispatchRmk;
// 货物图片 // 货物图片
private String billPicGoodsRmk; private String billPicGoodsRmk;
/* 是否特殊报价 */
private String blSpecialQuote;
/* 扩展信息 */ /* 扩展信息 */
/* 是否生成子单 1-是 0-否 */ /* 是否生成子单 1-是 0-否 */
@ -522,6 +525,8 @@ public class WaybillOrder implements Serializable {
voItem.setOverWeightNumber(dbWaybill.getOverWeightNumber()); voItem.setOverWeightNumber(dbWaybill.getOverWeightNumber());
voItem.setFeeRemark(dbWaybill.getFeeRemark()); voItem.setFeeRemark(dbWaybill.getFeeRemark());
voItem.setBlSpecialQuote(dbWaybill.getBlSpecialQuote());
// voItem.setThirdCode(dbWaybill.getThirdCode()); // voItem.setThirdCode(dbWaybill.getThirdCode());
voItem.setRealValue(dbWaybill.getRealValue()); voItem.setRealValue(dbWaybill.getRealValue());
@ -737,6 +742,7 @@ public class WaybillOrder implements Serializable {
// dbWaybill.setBlBill(this.getBlBill()); // dbWaybill.setBlBill(this.getBlBill());
// dbWaybill.setBlBillText(this.getBlBillText()); // dbWaybill.setBlBillText(this.getBlBillText());
dbWaybill.setBlSpecialGoods(this.getBlSpecialQuote());
dbWaybill.setBlOverWeight(this.getBlOverWeight()); dbWaybill.setBlOverWeight(this.getBlOverWeight());
dbWaybill.setOverWeightNumber(this.getOverWeightNumber()); dbWaybill.setOverWeightNumber(this.getOverWeightNumber());

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

@ -219,6 +219,10 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
gotImgBmk=gotImgBmk+attachment.getFileUrl()+","; gotImgBmk=gotImgBmk+attachment.getFileUrl()+",";
} }
} }
signImgBmk=StringUtils.removeEnd(signImgBmk, ",");
goodsImgBmk=StringUtils.removeEnd(goodsImgBmk, ",");
gotImgBmk=StringUtils.removeEnd(gotImgBmk, ",");
// private String billPicSendRmk; // private String billPicSendRmk;
// /* 签收底单图片 */ // /* 签收底单图片 */