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

demand: TMS-成本管理-批量导入成本-导入支持根据批次号导入

Browse Source
This commit is contained in:
aike 2025-12-15 14:06:46 +08:00
parent aebd21a3d6
commit 77741b06f9
4 changed files with 12 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> {
}