From 5181720e7c65d99613591182441f59d3136c1c76 Mon Sep 17 00:00:00 2001 From: linfso Date: Tue, 30 Jul 2024 10:36:28 +0800 Subject: [PATCH] md --- .../erp/apiweb/WarehouseInController.java | 128 ++++++++++++++++++ .../xdadan/erp/apiweb/WaybillController.java | 26 ---- .../erp/apiweb/WmsWarehouseController.java | 13 +- 3 files changed, 137 insertions(+), 30 deletions(-) create mode 100644 emis-api-web/src/main/java/com/xdadan/erp/apiweb/WarehouseInController.java diff --git a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WarehouseInController.java b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WarehouseInController.java new file mode 100644 index 0000000..559d6ec --- /dev/null +++ b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WarehouseInController.java @@ -0,0 +1,128 @@ + +/** + * @Project: emis + * @Title: EmisWarehouseInController.java + * @author linfso + * @date 2024-05-22 00:20:31 + * @Copyright: ShangHai Duta 2022 All rights reserved. + * @version v1.0 + * @Description:

进仓单 控制器

+ */ + +package com.xdadan.erp.apiweb; + +import com.xdadan.erp.common.annotation.Log; +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.poi.ExcelUtil; +import com.xdadan.erp.emis.domain.EmisWarehouseIn; +import com.xdadan.erp.emis.domain.exception.EmisBizError; +import com.xdadan.erp.emis.domain.vo.WaybillOrder; +import com.xdadan.erp.emis.service.IEmisWarehouseInService; +import com.xdadan.erp.emis.service.IEmisWaybillService; +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.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; + +/** + * 进仓单Controller + * + * @author linfso + * @date 2024-05-22 00:20:31 + */ +@RestController +@RequestMapping("/apiweb/emisWarehouseIn") +public class WarehouseInController extends BaseController +{ + @Autowired + private IEmisWarehouseInService emisWarehouseInService; + + @Autowired + private IEmisWaybillService emisWaybillService; + + /** + * 查询进仓单列表 + */ + @GetMapping("/list") + public TableDataInfo list(EmisWarehouseIn emisWarehouseIn) + { + startPage(); + + if(!StringUtils.isEmpty(emisWarehouseIn.getBillCode())){ + emisWarehouseIn.setBillCode( WaybillHelper.formatQueryValue(emisWarehouseIn.getBillCode())); + String[] billCodeSortList = emisWarehouseIn.getBillCode().split(","); + if(billCodeSortList.length>1){ + emisWarehouseIn.getParams().put("billCodeSortList", Arrays.asList(billCodeSortList)); + } + } + + + if(!StringUtils.isEmpty(emisWarehouseIn.getInNo())){ + emisWarehouseIn.setInNo(WaybillHelper.formatQueryValue(emisWarehouseIn.getInNo())); + String[] inNoSortList = emisWarehouseIn.getInNo().split(","); + if(inNoSortList.length>1){ + emisWarehouseIn.getParams().put("inNoSortList",Arrays.asList(inNoSortList)); + } + } + + List list = emisWarehouseInService.selectEmisWarehouseInList(emisWarehouseIn); + return getDataTable(list); + } + +// @JacksonFilter(include= {"id","inNo","customerCode","customerName","entryDate"},value= EmisWarehouseIn.class,type= JacksonFilter.JscksonFilterType.RESPONSE) + @GetMapping("/listSimple") + public TableDataInfo listSimple(EmisWarehouseIn emisWarehouseIn) + { + startPage(); + emisWarehouseIn.setUsedStatus("0"); + List list = emisWarehouseInService.selectEmisWarehouseInList(emisWarehouseIn); + return getDataTable(list); + } + + + /** + * 获取进仓单详细信息 + */ + @GetMapping(value = "/getWarehouseInByInNo") + public AjaxResult getWarehouseInByInNo(EmisWarehouseIn emisWarehouseIn) + { + return AjaxResult.success(emisWarehouseInService.selectEmisWarehouseInByInNo(emisWarehouseIn.getInNo())); + } + + /** + * 导出进仓单模板 + * @param response + * @return + */ + @Log(title = "导出进仓单", businessType = BusinessType.EXPORT) + @PostMapping("/exportWarehouseInTpl") + public AjaxResult exportWarehouseInTpl(HttpServletResponse response,@RequestBody WaybillOrder waybillOrder) { + + try{ + emisWaybillService.genWarehouseInTplFile(response,waybillOrder.getOrderSn()); + return AjaxResult.success("下载成功"); + } + catch(EmisBizError ex){ + ex.printStackTrace(); + return AjaxResult.error("("+ex.getErrorCode()+")"+ex.getMessage()); + } + catch (Exception ex){ + ex.printStackTrace(); + // 返回子定义异常 + if(ex instanceof EmisBizError){ + return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode()); + } + + return AjaxResult.error("服务器异常，联系客服"); + } + } + +} diff --git a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java index 1931e4c..04ab410 100644 --- a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java +++ b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java @@ -259,33 +259,7 @@ public class WaybillController extends BaseController } } - /** - * 导出进仓单模板 - * @param response - * @return - */ - @Log(title = "导出进仓单", businessType = BusinessType.EXPORT) - @PostMapping("/exportWarehouseInTpl") - public AjaxResult exportWarehouseInTpl(HttpServletResponse response,@RequestBody WaybillOrder waybillOrder) { - try{ - emisWaybillService.genWarehouseInTplFile(response,waybillOrder.getOrderSn()); - return AjaxResult.success("下载成功"); - } - catch(EmisBizError ex){ - ex.printStackTrace(); - return AjaxResult.error("("+ex.getErrorCode()+")"+ex.getMessage()); - } - catch (Exception ex){ - ex.printStackTrace(); - // 返回子定义异常 - if(ex instanceof EmisBizError){ - return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode()); - } - - return AjaxResult.error("服务器异常，联系客服"); - } - } @Log(title = "运费试算", businessType = BusinessType.OTHER) @PostMapping(value = "/preCalcWaybillFeeByOms") diff --git a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WmsWarehouseController.java b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WmsWarehouseController.java index aedf0a8..994118b 100644 --- a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WmsWarehouseController.java +++ b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WmsWarehouseController.java @@ -11,6 +11,7 @@ package com.xdadan.erp.apiweb; +import cn.hutool.core.map.MapUtil; import com.xdadan.erp.common.annotation.Log; import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter; import com.xdadan.erp.common.core.controller.BaseController; @@ -54,7 +55,7 @@ public class WmsWarehouseController extends BaseController "code","name","contact", "tel","address", },value= WmsWarehouse.class,type= JacksonFilter.JscksonFilterType.RESPONSE) - public TableDataInfo listWmsWarehouse(EmisSite emisSite) + public TableDataInfo listWmsWarehouse(WmsWarehouse wmsWarehouse) { // "code": "仓库编码", @@ -64,10 +65,14 @@ public class WmsWarehouseController extends BaseController // "address": "地址" startPage(); -// WmsWarehouse wmsWarehouse = new WmsWarehouse(); -// wmsWarehouse.setSearchValue(searchValue); -// List list = wmsWarehouseService.selectWmsWarehouseList(wmsWarehouse); + + // 使用网点作为仓库 + EmisSite emisSite = new EmisSite(); + emisSite.setSearchValue(wmsWarehouse.getSearchValue()); + + String transLine= MapUtil.getStr(wmsWarehouse.getParams(),"transLine"); + emisSite.setTransTypeId(transLine); List list = emisSiteService.selectEmisSiteListAsWarehouse(emisSite);