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-13 06:07:36 +08:00
parent 58b579cfe7
commit 66477d8e6d
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -350,10 +350,7 @@ public class EmisWaybill extends BaseEntity
/* sign_date */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date signDate;
/* 揽收图片备注 */
private String billPicSendRmk;
/* 签收底单图片 */
private String billPicDispatchRmk;
/* 时区偏差 */
private String timezoneOffset;
/* 付款状态 字典:emis_payment_status */
@ -441,9 +438,11 @@ public class EmisWaybill extends BaseEntity
// - 揽收底单图片
// - 签收底单图片
/* 揽收图片备注 */
private String billPicSendRmk;
/* 签收底单图片 */
private String billPicDispatchRmk;
// - 货物图片
// private String billPicSendRmk;
// private String billPicDispatchRmk;
private String billPicGoodsRmk;
// 是否已锁单 T,锁单原因

11
emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
View File

@ -156,8 +156,9 @@
<result property="signManCode" column="sign_man_code" />
<result property="signSiteCode" column="sign_site_code" />
<result property="signDate" column="sign_date" />
<result property="billPicSendRmk" column="bill_pic_send_rmk" />
<result property="billPicDispatchRmk" column="bill_pic_dispatch_rmk" />
<result property="timezoneOffset" column="timezone_offset" />
<result property="paymentStatus" column="payment_status" />
<result property="paymentDate" column="payment_date" />
@ -203,6 +204,12 @@
<result property="problemTypeName" column="problem_type_name" />
<result property="billPicSendRmk" column="bill_pic_send_rmk" />
<result property="billPicDispatchRmk" column="bill_pic_dispatch_rmk" />
<result property="billPicGoodsRmk" column="goods_pics" />
</resultMap>
<resultMap id="EmisWaybillResult" extends="BaseEmisWaybillResult" type="EmisWaybill">