From d7c03819951f64cb5aa40b98524e092a4dc5325a Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Fri, 28 Jun 2024 09:04:21 +0800 Subject: [PATCH] 6/28 --- .../yxt/wms/biz/func/warehouseansbill/WarehouseAnsBill.java | 2 ++ .../biz/func/warehouseansbill/WarehouseAnsBillService.java | 1 + .../wms/biz/func/warehouseansbill/WarehouseAnsBillVo.java | 2 ++ .../wms/biz/func/warehouseansbill/WarehouseAnsDetailsVo.java | 2 ++ .../yxt/wms/biz/func/warehousearea/WarehouseAreaService.java | 4 +--- .../biz/func/warehouseareatype/WarehouseAreaTypeService.java | 3 +-- .../yxt/wms/biz/func/warehouseinfo/WarehouseInfoService.java | 3 +-- .../yxt/wms/biz/func/warehouserack/WarehouseRackService.java | 5 +---- .../warehouse/warehouseansbill/WarehouseAnsBillFeign.java | 3 +++ .../warehouseansbill/WarehouseAnsBillFeignFallback.java | 5 +++++ .../feign/warehouse/warehousearea/WarehouseAreaFeign.java | 2 +- .../warehouse/warehouseareatype/WarehouseAreaTypeFeign.java | 2 +- .../wms/feign/warehouse/warehouseinfo/WarehouseFeign.java | 2 +- .../warehouse/warehouseinfo/WarehouseFeignFallback.java | 2 +- .../feign/warehouse/wmswarehouserack/WarehouseRackFeign.java | 2 +- 15 files changed, 24 insertions(+), 16 deletions(-) diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBill.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBill.java index 8a0291d..8f28e8a 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBill.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBill.java @@ -1,5 +1,6 @@ package com.yxt.wms.biz.func.warehouseansbill; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -43,6 +44,7 @@ public class WarehouseAnsBill extends BaseEntity { @ApiModelProperty("货主") private String goodsOwner; @ApiModelProperty("预计到货日期") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private Date deliveryDate; @ApiModelProperty("使用组织sid") private String useOrgSid; diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillService.java index 2a3ac5a..71547ff 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillService.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillService.java @@ -23,6 +23,7 @@ public class WarehouseAnsBillService extends MybatisBaseService> listPages(PagerQuery pagerQuery) { return wmsAnsBillFeign.listPage(pagerQuery); } diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillVo.java index 3f18f22..7469c18 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillVo.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillVo.java @@ -1,5 +1,6 @@ package com.yxt.wms.biz.func.warehouseansbill; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -30,6 +31,7 @@ public class WarehouseAnsBillVo { @ApiModelProperty("联系人手机") private String mobile; @ApiModelProperty("预计到货日期") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private String deliveryDate; //单据状态 diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsDetailsVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsDetailsVo.java index d6c73b2..0e3e39e 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsDetailsVo.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsDetailsVo.java @@ -1,5 +1,6 @@ package com.yxt.wms.biz.func.warehouseansbill; +import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.wms.biz.func.warehouseansbilldetail.WarehouseAnsListDetailsVo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -30,6 +31,7 @@ public class WarehouseAnsDetailsVo { @ApiModelProperty("供应商名称") private String supplierName; @ApiModelProperty("预计到货日期") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") private String deliveryDate; //单据状态 diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousearea/WarehouseAreaService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousearea/WarehouseAreaService.java index b5bc739..f4e5015 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousearea/WarehouseAreaService.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousearea/WarehouseAreaService.java @@ -44,9 +44,7 @@ public class WarehouseAreaService extends MybatisBaseService defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); pq.getParams().setOrgLevelKey(defaultIdReltBean.getData()); - IPage pagging = warehouseAreaFeign.listPage(pq).getData(); - PagerVo p = PagerUtil.pageToVo(pagging, null); - List records = pagging.getRecords(); + PagerVo p = warehouseAreaFeign.listPage(pq).getData(); return rb.success().setData(p); } public ResultBean> getAllType(OrgPathQuery query) { diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseareatype/WarehouseAreaTypeService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseareatype/WarehouseAreaTypeService.java index 01b6325..6845d29 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseareatype/WarehouseAreaTypeService.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseareatype/WarehouseAreaTypeService.java @@ -48,8 +48,7 @@ public class WarehouseAreaTypeService extends MybatisBaseService defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); pq.getParams().setOrgLevelKey(defaultIdReltBean.getData()); - IPage pagging = warehouseAreaTypeFeign.listPage(pq).getData(); - PagerVo p = PagerUtil.pageToVo(pagging, null); + PagerVo p = warehouseAreaTypeFeign.listPage(pq).getData(); return rb.success().setData(p); } public ResultBean> listAll(OrgPathQuery query) { diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoService.java index b4249b6..755f25c 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoService.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoService.java @@ -46,8 +46,7 @@ public class WarehouseInfoService extends MybatisBaseService defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); pq.getParams().setOrgLevelKey(defaultIdReltBean.getData()); - IPage pagging = WarehouseFeign.listPage(pq).getData(); - PagerVo p = PagerUtil.pageToVo(pagging, null); + PagerVo p = WarehouseFeign.listPage(pq).getData(); return rb.success().setData(p); } public ResultBean> listAll(OrgPathQuery query) { diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouserack/WarehouseRackService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouserack/WarehouseRackService.java index 61446c8..d6b1b5c 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouserack/WarehouseRackService.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouserack/WarehouseRackService.java @@ -45,10 +45,7 @@ public class WarehouseRackService extends MybatisBaseService defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); pq.getParams().setOrgLevelKey(defaultIdReltBean.getData()); - - IPage pagging = warehouseRackFeign.listPage(pq).getData(); - PagerVo p = PagerUtil.pageToVo(pagging, null); - List records = pagging.getRecords(); + PagerVo p = warehouseRackFeign.listPage(pq).getData(); return rb.success().setData(p); } public ResultBean getAllType() { diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeign.java index 4a6ad89..fc18462 100644 --- a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeign.java +++ b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeign.java @@ -36,6 +36,9 @@ public interface WarehouseAnsBillFeign { @PostMapping("saveOrUpdate") @ApiOperation("新增修改保存") ResultBean saveOrUpdate(@RequestBody WarehouseAnsBillDto dto); + @PostMapping("saveBill") + @ApiOperation("oms推送预期到货通知单") + ResultBean saveBill(@RequestBody WarehouseAnsBillDto dto); /* @PostMapping("pageList") @ApiOperation("收货单据选择") diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeignFallback.java b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeignFallback.java index 64f8c20..dc4879a 100644 --- a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeignFallback.java +++ b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeignFallback.java @@ -30,6 +30,11 @@ public class WarehouseAnsBillFeignFallback implements WarehouseAnsBillFeign { return null; } + @Override + public ResultBean saveBill(WarehouseAnsBillDto dto) { + return null; + } + @Override public ResultBean> listPage(PagerQuery pagerQuery) { return null; diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehousearea/WarehouseAreaFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehousearea/WarehouseAreaFeign.java index 5495510..f6d5be5 100644 --- a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehousearea/WarehouseAreaFeign.java +++ b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehousearea/WarehouseAreaFeign.java @@ -35,7 +35,7 @@ import java.util.List; public interface WarehouseAreaFeign { @ApiOperation("分页列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery query); + public ResultBean> listPage(@RequestBody PagerQuery query); @ApiOperation("查询所有的库区") @GetMapping("/listAll") public ResultBean> listAll(); diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseareatype/WarehouseAreaTypeFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseareatype/WarehouseAreaTypeFeign.java index db2640b..51f2905 100644 --- a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseareatype/WarehouseAreaTypeFeign.java +++ b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseareatype/WarehouseAreaTypeFeign.java @@ -38,7 +38,7 @@ import java.util.List; public interface WarehouseAreaTypeFeign { @ApiOperation("分页列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq); + public ResultBean> listPage(@RequestBody PagerQuery pq); @ApiOperation("查询所有的") @GetMapping("/listAll/{useOrgSid}") public ResultBean> listAll(@PathVariable("useOrgSid")String useOrgSid); diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseinfo/WarehouseFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseinfo/WarehouseFeign.java index 513d984..f1ea333 100644 --- a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseinfo/WarehouseFeign.java +++ b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseinfo/WarehouseFeign.java @@ -35,7 +35,7 @@ import java.util.List; public interface WarehouseFeign { @ApiOperation("分页列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq); + public ResultBean> listPage(@RequestBody PagerQuery pq); @ApiOperation("查询所有的仓库") @GetMapping("/listAll/{useOrgSid}") public ResultBean> listAll(@PathVariable("useOrgSid") String useOrgSid); diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseinfo/WarehouseFeignFallback.java b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseinfo/WarehouseFeignFallback.java index aa5a765..202675d 100644 --- a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseinfo/WarehouseFeignFallback.java +++ b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseinfo/WarehouseFeignFallback.java @@ -28,7 +28,7 @@ public class WarehouseFeignFallback implements WarehouseFeign { @Override - public ResultBean> listPage(PagerQuery pq) { + public ResultBean> listPage(PagerQuery pq) { return null; } diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/wmswarehouserack/WarehouseRackFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/wmswarehouserack/WarehouseRackFeign.java index 1ad8b15..7a4bc12 100644 --- a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/wmswarehouserack/WarehouseRackFeign.java +++ b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/wmswarehouserack/WarehouseRackFeign.java @@ -38,7 +38,7 @@ public interface WarehouseRackFeign { @ApiOperation("分页列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq); + public ResultBean> listPage(@RequestBody PagerQuery pq); @ApiOperation("查询所有的库区") @GetMapping("/getAllType") public ResultBean getAllType();