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-13 16:06:24 +08:00
parent 8eaa769e68
commit f98ee3f245
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransProductController.java
View File

@ -64,7 +64,7 @@ public class EmisTransProductController extends BaseController
} }
// @PreAuthorize("@ss.hasPermi('emis:emisTransProduct:list')") // @PreAuthorize("@ss.hasPermi('emis:emisTransProduct:list')")
@JacksonFilter(include= {"id","prodCode","prodName","prodNameEn"},value= EmisTransProduct.class,type= JacksonFilter.JscksonFilterType.RESPONSE) @JacksonFilter(include= {"id","prodCode","prodName","prodNameEn","agingDesc"},value= EmisTransProduct.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
@RequestMapping("/listSimple") @RequestMapping("/listSimple")
public TableDataInfo listSimple(EmisTransProduct emisTransProduct) public TableDataInfo listSimple(EmisTransProduct emisTransProduct)
{ {

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

@ -58,8 +58,7 @@ public class EmisWaybill extends BaseEntity
private Long userId; private Long userId;
/* 寄件客户编号2502021 */ /* 寄件客户编号2502021 */
private String customerCode; private String customerCode;
/* 寄件客户客户名称 */
private String customerName;
/* 收件客户编号2502021 */ /* 收件客户编号2502021 */
private String receiveCustomerCode; private String receiveCustomerCode;
/* 收件客户客户名称 */ /* 收件客户客户名称 */
@ -344,14 +343,12 @@ public class EmisWaybill extends BaseEntity
/* 时区偏差 */ /* 时区偏差 */
private String timezoneOffset; private String timezoneOffset;
private List<EmisWaybillCargo> cargoList; private List<EmisWaybillCargo> cargoList;
private List<EmisWaybillFeeitem> feeitemList; private List<EmisWaybillFeeitem> feeitemList;
private List<EmisWaybillAttachment> attachmentList; private List<EmisWaybillAttachment> attachmentList;
private String sendSiteName; private String sendSiteName;
/* 扩展信息 */ /* 扩展信息 */
private String receiveCountryName; private String receiveCountryName;
private String receiveProvinceName; private String receiveProvinceName;
@ -364,8 +361,7 @@ public class EmisWaybill extends BaseEntity
// private String transLineName; // private String transLineName;
private String productName; private String productName;
/* 寄件客户客户名称 */
private String customerName;
} }

3
emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml
View File

@ -162,8 +162,7 @@
<!-- 包含子网点 --> <!-- 包含子网点 -->
AND owner_site in ( AND owner_site in (
SELECT t1.site_code FROM ( SELECT t1.site_code FROM (
SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid := SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=#{ownerSite} ) pd
#{ownerSite} ) pd
WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code) WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
UNION UNION
SELECT #{ownerSite} FROM dual SELECT #{ownerSite} FROM dual