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 2025-01-09 15:07:30 +08:00
parent c27974cbdf
commit 38b317a07d
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,8 +11,12 @@
package com.xdadan.erp.web.emis;
import java.util.Arrays;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.xdadan.erp.emis.utils.WaybillHelper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;
@ -29,7 +33,6 @@ import com.xdadan.erp.common.core.controller.BaseController;
import com.xdadan.erp.common.core.domain.AjaxResult;
import com.xdadan.erp.common.core.page.TableDataInfo;
import com.xdadan.erp.common.enums.BusinessType;
import com.xdadan.erp.common.utils.StringUtils;
import com.xdadan.erp.common.utils.poi.ExcelUtil;
import com.xdadan.erp.emis.domain.EmisTmsSiteBatch;
@ -61,6 +64,17 @@ public class EmisTmsSiteBatchController extends EmisBaseController
// 设置通用权限查询参数
setPrivParams(emisTmsSiteBatch);
if(!StringUtils.isEmpty(emisTmsSiteBatch.getBatchNo())){
emisTmsSiteBatch.setBatchNo(WaybillHelper.formatQueryValue(emisTmsSiteBatch.getBatchNo()));
}
if(emisTmsSiteBatch.getParams().get("billCode")!=null){
String billCodeStr=emisTmsSiteBatch.getParams().get("billCode").toString();
billCodeStr=WaybillHelper.formatQueryValue(billCodeStr);
emisTmsSiteBatch.getParams().put("billCode",billCodeStr);
}
List<EmisTmsSiteBatch> list = emisTmsSiteBatchService.selectEmisTmsSiteBatchList(emisTmsSiteBatch);
return getDataTable(list);
}

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

@ -98,7 +98,7 @@
</if>
<if test="params.billCode != null and params.billCode != ''">
and batch_no in (select batch_no from emis_tms_site_batch_dtl where del_flag='0' and bill_code=#{params.billCode})
and batch_no in (select batch_no from emis_tms_site_batch_dtl where del_flag='0' and FIND_IN_SET(`bill_code`,#{params.billCode}) )
</if>
<if test="params.beginCreateTime != null and params.beginCreateTime != ''">