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-05-31 11:34:33 +08:00
parent ac3779f4f6
commit c9240d1268
5 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
View File

@ -118,6 +118,11 @@ public class EmisWaybillController extends BaseController
waybillOrder.setTakePieceEmployeePhone(user.getPhonenumber()); waybillOrder.setTakePieceEmployeePhone(user.getPhonenumber());
} }
// 判断是否已经锁单
return AjaxResult.success("获取成功",waybillOrder); return AjaxResult.success("获取成功",waybillOrder);
} }
catch (Exception ex){ catch (Exception ex){

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

@ -430,4 +430,7 @@ public class EmisWaybill extends BaseEntity
// private String billPicDispatchRmk; // private String billPicDispatchRmk;
private String billPicGoodsRmk; private String billPicGoodsRmk;
// 是否已锁单 T
private String lockFlag;
} }

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

@ -321,6 +321,9 @@ public class WaybillOrder implements Serializable {
/* 上一网点点号 */ /* 上一网点点号 */
private String lastSiteCode; private String lastSiteCode;
// 是否已锁单
private String lockFlag;
@ -586,6 +589,8 @@ public class WaybillOrder implements Serializable {
// voItem.setCreateSite(dbWaybill.getCreateSite()); // voItem.setCreateSite(dbWaybill.getCreateSite());
// voItem.setUpdateSite(dbWaybill.getUpdateSite()); // voItem.setUpdateSite(dbWaybill.getUpdateSite());
voItem.setLockFlag(dbWaybill.getLockFlag());
return voItem; return voItem;
} }

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSpecialCalcWeightServiceImpl.java
View File

@ -72,8 +72,6 @@ public class EmisSpecialCalcWeightServiceImpl implements IEmisSpecialCalcWeightS
} }
/** /**
* 修改特殊取重 * 修改特殊取重
* *

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

@ -228,6 +228,13 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
queryAttachment.setWaybillId(dbEmisWaybill.getId()); queryAttachment.setWaybillId(dbEmisWaybill.getId());
List<EmisWaybillAttachment> dbAttachmentList=emisWaybillAttachmentMapper.selectEmisWaybillAttachmentList(queryAttachment); List<EmisWaybillAttachment> dbAttachmentList=emisWaybillAttachmentMapper.selectEmisWaybillAttachmentList(queryAttachment);
boolean isLock=isWaybillLock(dbEmisWaybill);
if(isLock){
dbEmisWaybill.setLockFlag("T");
}
return WaybillOrder.toVo(dbEmisWaybill,dbCargoList,dbFeeItemList,dbAttachmentList); return WaybillOrder.toVo(dbEmisWaybill,dbCargoList,dbFeeItemList,dbAttachmentList);
} }