diff --git a/.idea/libraries/Maven__com_xdadan_emis_wms_1_0_2.xml b/.idea/libraries/Maven__com_xdadan_emis_wms_1_0_2.xml new file mode 100644 index 0000000..5d31604 --- /dev/null +++ b/.idea/libraries/Maven__com_xdadan_emis_wms_1_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..e96534f --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/emis-api-web/emis-api-web.iml b/emis-api-web/emis-api-web.iml index 0e05a4c..63bf8b7 100644 --- a/emis-api-web/emis-api-web.iml +++ b/emis-api-web/emis-api-web.iml @@ -266,5 +266,6 @@ + \ No newline at end of file diff --git a/emis-api-web/pom.xml b/emis-api-web/pom.xml index 6e80dd2..9f69965 100644 --- a/emis-api-web/pom.xml +++ b/emis-api-web/pom.xml @@ -37,6 +37,13 @@ 1.0.2 + + com.xdadan + emis-wms + 1.0.2 + compile + + diff --git a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/TmsScanRecordController.java b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/TmsScanRecordController.java new file mode 100644 index 0000000..c75fb0c --- /dev/null +++ b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/TmsScanRecordController.java @@ -0,0 +1,76 @@ + +/** + * @Project: emis + * @Title: EmisTmsScanRecordController.java + * @author linfso + * @date 2024-03-07 10:42:44 + * @Copyright: ShangHai Duta 2022 All rights reserved. + * @version v1.0 + * @Description:

TMS扫描记录 控制器

+ */ + +package com.xdadan.erp.apiweb; + + +import com.xdadan.erp.common.core.controller.BaseController; +import com.xdadan.erp.common.core.domain.AjaxResult; +import com.xdadan.erp.emis.service.IEmisTmsScanRecordService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * TMS扫描记录Controller + * + * @author linfso + * @date 2024-03-07 10:42:44 + */ +@Slf4j +@RestController +@RequestMapping("/apiweb/emisTmsScanRecord") +public class TmsScanRecordController extends BaseController +{ + + @Autowired + private IEmisTmsScanRecordService emisTmsScanRecordService; + + /** + * 查询物流轨迹信息 + * @param trackingNo + * @return + */ + @GetMapping("/queryWaybillTraceInfo") + public AjaxResult queryWaybillTraceInfo(String trackingNo, String lang) + { + if(StringUtils.isEmpty(trackingNo)){ + return AjaxResult.error("跟踪号不能为空"); + } + + String[] billCodeArr = trackingNo.split(","); + // 最多不超过50个 + if(billCodeArr.length>50){ + return AjaxResult.error("每次最多不超过50单号"); + } + + List rstList = new ArrayList(); + for (String billCode:billCodeArr) { + Map rstMap = new HashMap<>(); + rstMap.put("billCode",billCode); + List stepList=emisTmsScanRecordService.queryWaybillTraceInfo(billCode,lang); + rstMap.put("steps",stepList); + rstList.add(rstMap); + } + + return AjaxResult.success("查询成功",rstList); + } + + +} 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 ee7fffa..d31af3b 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 @@ -11,10 +11,12 @@ package com.xdadan.erp.apiweb; +import cn.hutool.core.collection.CollectionUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.xdadan.erp.common.annotation.Log; +import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter; import com.xdadan.erp.common.config.PayConfig; import com.xdadan.erp.common.core.controller.BaseController; import com.xdadan.erp.common.core.domain.AjaxResult; @@ -37,7 +39,9 @@ import com.xdadan.erp.emis.service.print.IXddTplPrint; import com.xdadan.erp.emis.service.print.tanex.TanexTplPrintImpl; import com.xdadan.erp.emis.utils.WaybillHelper; import com.xdadan.erp.system.domain.SysFileInfo; +import com.xdadan.erp.system.domain.SysPost; import com.xdadan.erp.system.service.ISysFileInfoService; +import com.xdadan.erp.system.service.ISysPostService; import com.xdadan.erp.system.service.ISysUserService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -65,6 +69,12 @@ import java.util.*; @RequestMapping("/apiweb/emisWaybill") public class WaybillController extends BaseController { + @Autowired + private ISysUserService userService; + + @Autowired + private ISysPostService postService; + @Autowired private IEmisWaybillService emisWaybillService; @@ -276,4 +286,5 @@ public class WaybillController extends BaseController + } 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 new file mode 100644 index 0000000..ca0e878 --- /dev/null +++ b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WmsWarehouseController.java @@ -0,0 +1,52 @@ + +/** + * @Project: wms + * @Title: WmsWarehouseController.java + * @author linfso + * @date 2023-05-08 04:06:49 + * @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.wms.domain.WmsWarehouse; +import com.xdadan.erp.wms.service.IWmsWarehouseService; +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.List; + +/** + * 仓库Controller + * + * @author linfso + * @date 2023-05-08 04:06:49 + */ +@RestController +@RequestMapping("/apiweb/wmsWarehouse") +public class WmsWarehouseController extends BaseController +{ + @Autowired + private IWmsWarehouseService wmsWarehouseService; + + /** + * 查询仓库列表 + */ + @GetMapping("/listWmsWarehouse") + public TableDataInfo listWmsWarehouse(WmsWarehouse wmsWarehouse) + { + startPage(); + List list = wmsWarehouseService.selectWmsWarehouseList(wmsWarehouse); + return getDataTable(list); + } + +}