aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'develop' (#268) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/268
This commit is contained in:
heyu 2025-12-15 15:49:03 +08:00
commit 6eb690e5c6
5 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java
View File

@ -97,13 +97,19 @@ public class EmisTmsSiteBatchController extends EmisBaseController
/**
* 用于批次批量上传使用
*
* @param emisTmsSiteBatch
* @return
*/
@GetMapping("/listBySupplerAndCarNo")
public TableDataInfo listBySupplerAndCarNo(EmisTmsSiteBatch emisTmsSiteBatch)
{
List<EmisTmsSiteBatch> list = emisTmsSiteBatchService.selectTmsSiteBatchBySupplerAndCarNo(emisTmsSiteBatch.getSupplierCode(),emisTmsSiteBatch.getCarNo(),emisTmsSiteBatch.getEtd());
public TableDataInfo listBySupplerAndCarNo(EmisTmsSiteBatch emisTmsSiteBatch) {
if (StringUtils.isNotBlank(emisTmsSiteBatch.getBatchNo())) {
EmisTmsSiteBatch queryByBatchNo = new EmisTmsSiteBatch();
queryByBatchNo.setBatchNo(emisTmsSiteBatch.getBatchNo());
List<EmisTmsSiteBatch> list = emisTmsSiteBatchService.selectEmisTmsSiteBatchList(queryByBatchNo);
return getDataTable(list);
}
List<EmisTmsSiteBatch> list = emisTmsSiteBatchService.selectTmsSiteBatchBySupplerAndCarNo(emisTmsSiteBatch.getSupplierCode(), emisTmsSiteBatch.getCarNo(), emisTmsSiteBatch.getEtd());
return getDataTable(list);
}

1
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/annotation/WaybillLightCount.java
View File

@ -13,3 +13,4 @@ public @interface WaybillLightCount {
}

1
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillOther.java
View File

@ -50,3 +50,4 @@ public class EmisWaybillOther extends BaseEntity {
}

1
emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillOtherMapper.java
View File

@ -79,3 +79,4 @@ public interface EmisWaybillOtherMapper extends BaseMapper<EmisWaybillOther> {
}

3
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -3381,6 +3381,9 @@ public class EmisBaseService {
* @return
*/
public EmisCustomerUser createMoneyCustomerUser(EmisCustomerUser emisCustomerUser) {
if(Objects.isNull(emisCustomerUser)||StringUtils.isBlank(emisCustomerUser.getPhone())){
return new EmisCustomerUser();
}
// 直接返回客户
if (emisCustomerUser.getCustomerCode() != null) {
return emisCustomerUser;