Merge pull request 'demand: TMS-成本管理-批量导入成本-导入支持根据批次号导入' (#270) from develop into master

Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/270
This commit is contained in:
heyu 2025-12-15 16:41:33 +08:00
commit 258bc01f76

View File

@ -104,9 +104,7 @@ public class EmisTmsSiteBatchController extends EmisBaseController
@GetMapping("/listBySupplerAndCarNo")
public TableDataInfo listBySupplerAndCarNo(EmisTmsSiteBatch emisTmsSiteBatch) {
if (StringUtils.isNotBlank(emisTmsSiteBatch.getBatchNo())) {
EmisTmsSiteBatch queryByBatchNo = new EmisTmsSiteBatch();
queryByBatchNo.setBatchNo(emisTmsSiteBatch.getBatchNo());
List<EmisTmsSiteBatch> list = emisTmsSiteBatchService.selectEmisTmsSiteBatchList(queryByBatchNo);
List<EmisTmsSiteBatch> list = emisTmsSiteBatchService.selectEmisTmsSiteBatchList(emisTmsSiteBatch);
return getDataTable(list);
}
List<EmisTmsSiteBatch> list = emisTmsSiteBatchService.selectTmsSiteBatchBySupplerAndCarNo(emisTmsSiteBatch.getSupplierCode(), emisTmsSiteBatch.getCarNo(), emisTmsSiteBatch.getEtd());