From 490adc639b80f26a8711016ea2737aa0fcb9a583 Mon Sep 17 00:00:00 2001 From: linfso Date: Tue, 17 Jun 2025 18:06:55 +0800 Subject: [PATCH] md --- .../erp/web/emis/EmisSupplierController.java | 2 +- .../web/emis/EmisTmsSiteBatchController.java | 22 ++++++++----------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSupplierController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSupplierController.java index c2df6dec3..3071f4993 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSupplierController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSupplierController.java @@ -129,7 +129,7 @@ public class EmisSupplierController extends BaseController public AjaxResult getSupplierByName(EmisSupplier emisSupplier) { if(StringUtils.isEmpty(emisSupplier.getName())){ - return AjaxResult.error("供应商不存在"); + return AjaxResult.error("供应商不名称不能为空"); } return AjaxResult.success(emisSupplierService.selectEmisSupplierByName(emisSupplier.getName())); } diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java index 8768007dc..276b50297 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java @@ -15,6 +15,7 @@ import java.util.Arrays; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.alibaba.fastjson.JSONObject; import com.xdadan.erp.emis.utils.WaybillHelper; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -75,26 +76,21 @@ public class EmisTmsSiteBatchController extends EmisBaseController emisTmsSiteBatch.getParams().put("billCode",billCodeStr); } - List list = emisTmsSiteBatchService.selectEmisTmsSiteBatchList(emisTmsSiteBatch); return getDataTable(list); } - @GetMapping("/getInfoBySupplerAndCarNo") - public AjaxResult getInfoBySupplerAndCarNo(EmisTmsSiteBatch emisTmsSiteBatch) + /** + * 用于批次批量上传使用 + * @param emisTmsSiteBatch + * @return + */ + @GetMapping("/listBySupplerAndCarNo") + public TableDataInfo listBySupplerAndCarNo(EmisTmsSiteBatch emisTmsSiteBatch) { List list = emisTmsSiteBatchService.selectTmsSiteBatchBySupplerAndCarNo(emisTmsSiteBatch.getSupplierCode(),emisTmsSiteBatch.getCarNo()); - if(!CollectionUtils.isEmpty(list)){ - return AjaxResult.error("未找到批次信息"); - } - - if(list.size()>1){ - return AjaxResult.error("存在多条批次信息"); - } - - return AjaxResult.success("成功",list.get(0)); - + return getDataTable(list); }