diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/WarehouseInfoRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/WarehouseInfoRest.java new file mode 100644 index 0000000..14719c2 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/WarehouseInfoRest.java @@ -0,0 +1,33 @@ +package com.yxt.oms.apiadmin.aggregation; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.warehouseinfo.SmsOrderHouseInfo; +import com.yxt.oms.biz.func.warehouseinfo.WarehouseInfoService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/27 16:14 + */ +@Api(tags = "仓库信息") +@RestController +@RequestMapping("/apiadmin/warehouseinfo") +public class WarehouseInfoRest { + + @Autowired + WarehouseInfoService wmsWarehouseService; + + + @ApiOperation("订单选择仓库") + @PostMapping("/getWareHouse") + public ResultBean> getWareHouse(@RequestParam("createOrgSid") String createOrgSid) { + return wmsWarehouseService.getWareHouse(createOrgSid); + } +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/SmsOrderHouseInfo.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/SmsOrderHouseInfo.java new file mode 100644 index 0000000..c49ef79 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/SmsOrderHouseInfo.java @@ -0,0 +1,27 @@ +package com.yxt.oms.biz.func.warehouseinfo; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author Fan + * @description + * @date 2024/7/22 8:54 + */ +@Data +public class SmsOrderHouseInfo { + + /** + * 仓库名称 + */ + private String warehouseName; + /** + * 仓库sid + */ + private String warehouseSid; + + + List houseRock = new ArrayList<>(); +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/SmsOrderRock.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/SmsOrderRock.java new file mode 100644 index 0000000..6aef3c2 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/SmsOrderRock.java @@ -0,0 +1,23 @@ +package com.yxt.oms.biz.func.warehouseinfo; + +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/7/22 8:54 + */ +@Data +public class SmsOrderRock { + + + /** + * 货位编码 + */ + private String warehouseRackCode; + /** + * 货位sid + */ + private String warehouseRackSid; + +} diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoService.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoService.java new file mode 100644 index 0000000..759100a --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoService.java @@ -0,0 +1,39 @@ +package com.yxt.oms.biz.func.warehouseinfo; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateTime; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.feign.warehouse.warehouseinfo.WarehouseInfoFeign; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.stream.Collectors; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Service +public class WarehouseInfoService { + + + @Autowired + private WarehouseInfoFeign warehouseInfoFeign; + + + public ResultBean> getWareHouse(String createOrgSid) { + return warehouseInfoFeign.getWareHouse(createOrgSid); + } +} diff --git a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinfo/WarehouseInfoFeign.java b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinfo/WarehouseInfoFeign.java new file mode 100644 index 0000000..4621d05 --- /dev/null +++ b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinfo/WarehouseInfoFeign.java @@ -0,0 +1,41 @@ +package com.yxt.oms.feign.warehouse.warehouseinfo; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.oms.biz.func.warehouseinfo.SmsOrderHouseInfo; +import com.yxt.oms.feign.warehouse.warehouseansbill.WarehouseAnsBillFeignFallback; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeign.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeign
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "仓库") +@FeignClient( + contextId = "ss-common-warehouse-WmsHouseInfo", + name = "ss-common-WmsHouseInfo", + path = "/apiadmin/warehouseinfo" + ) +public interface WarehouseInfoFeign { + @ApiOperation("订单选择仓库") + @PostMapping("/getWareHouse") + public ResultBean> getWareHouse(@RequestParam("createOrgSid") String createOrgSid); +}