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-26 06:50:03 +08:00
parent f901e94268
commit 43e09edad7
3 changed files with 42 additions and 7 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/EmisStaffController.java
View File

@ -62,11 +62,12 @@ public class EmisStaffController extends EmisBaseController
* 获取取件员列表
*/
// @PreAuthorize("@ss.hasPermi('system:user:list')")
@JacksonFilter(include= {"empCode","empName","ownerSiteCode","ownerSiteName"},value= SysUser.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
@JacksonFilter(include= {"userId","empCode","empName","ownerSiteCode","ownerSiteName"},value= SysUser.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
@GetMapping("/getStaffList")
public TableDataInfo getStaffList(String postCode,String empCode,String ownerSiteCode,String searchValue)
public TableDataInfo getStaffList(Long userId,String postCode,String empCode,String ownerSiteCode,String searchValue)
{
SysUser queryUser = new SysUser();
queryUser.setUserId(userId);
Long[] postIds = null;
if(!StringUtils.isEmpty(postCode)) {

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

@ -432,86 +432,120 @@ public class EmisWaybill extends BaseEntity
/* 是否敏感物 */
private String blSpecialGoods;
@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 String receiveCountryName;
@TableField(exist = false)
private String receiveProvinceName;
@TableField(exist = false)
private String receiveCityName;
@TableField(exist = false)
private String receiveCountyName;
@TableField(exist = false)
private String sendCountryName;
@TableField(exist = false)
private String sendProvinceName;
@TableField(exist = false)
private String sendCityName;
@TableField(exist = false)
private String sendCountyName;
@TableField(exist = false)
private String transLineTypeName;
@TableField(exist = false)
private String productTypeName;
/* 录单站点 */
@TableField(exist = false)
private String registerSiteName;
/* 录单人 */
@TableField(exist = false)
private String registerManName;
// 取件员 取件员电话
@TableField(exist = false)
private String takePieceEmployeeName;
@TableField(exist = false)
private String takePieceEmployeePhone;
// 操作员
@TableField(exist = false)
private String operateEmployeeName;
@TableField(exist = false)
private String sendSiteName;
// 目的地名称
@TableField(exist = false)
private String destinationName;
// 目的网点名称
@TableField(exist = false)
private String dispatchUnderlingSiteName;
// 派件网点名称,派件人
@TableField(exist = false)
private String dispatchSiteName;
@TableField(exist = false)
private String dispatchManName;
// 当前网点 下一网点 上一网点
@TableField(exist = false)
private String currentSiteName;
@TableField(exist = false)
private String nextSiteName;
@TableField(exist = false)
private String lastSiteName;
// 打印
@TableField(exist = false)
private String printManName;
@TableField(exist = false)
private String printSiteName;
// 销售,回款
@TableField(exist = false)
private String salesmenName;
@TableField(exist = false)
private String payeeName;
// 最后一条跟踪记录
@TableField(exist = false)
private String lastTraceInfo;
// 问题件类型
@TableField(exist = false)
private String problemTypeName;
// 最近一条扫描记录
@TableField(exist = false)
private EmisTmsScanRecord lastScanRecord;
// - 揽收底单图片
// - 签收底单图片
/* 揽收图片备注 */
@TableField(exist = false)
private String billPicSendRmk;
/* 签收底单图片 */
@TableField(exist = false)
private String billPicDispatchRmk;
// - 货物图片
@TableField(exist = false)
private String billPicGoodsRmk;
// 是否已锁单 T,锁单原因
@TableField(exist = false)
private String lockFlag;
@TableField(exist = false)
private String lockReason;
}

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

@ -693,6 +693,7 @@
and a.trans_line_type in(
select line_code from emis_trans_line etl where etl.trans_type=1
)
and bl_sign!='1' and waybill_status!='40'
and a.send_site_code=#{params.privSiteCode} and a.current_site_code=#{params.privSiteCode}
</if>
@ -703,7 +704,6 @@
</if>
<if test="params.privSiteCode != null and params.privSiteCode != '88888'">
and (
a.send_site_code in (