6/28

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;

wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillService.java

@@ -23,6 +23,7 @@ public class WarehouseAnsBillService extends MybatisBaseService<WarehouseAnsBill
         return wmsAnsBillFeign.saveOrUpdate(dto);
     }
 
+
     public ResultBean<PagerVo<WarehouseAnsBillVo>> listPages(PagerQuery<WarehouseAnsBillQuery> pagerQuery) {
         return wmsAnsBillFeign.listPage(pagerQuery);
     }

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;
 
     //单据状态

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;
 
     //单据状态

wms-biz/src/main/java/com/yxt/wms/biz/func/warehousearea/WarehouseAreaService.java

@@ -44,9 +44,7 @@ public class WarehouseAreaService extends MybatisBaseService<WarehouseAreaMapper
         privilegeQuery.setUserSid(query.getUserSid());
         ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
         pq.getParams().setOrgLevelKey(defaultIdReltBean.getData());
-        IPage<WarehouseAreaVo> pagging = warehouseAreaFeign.listPage(pq).getData();
-        PagerVo<WarehouseAreaVo> p = PagerUtil.pageToVo(pagging, null);
-        List<WarehouseAreaVo> records = pagging.getRecords();
+        PagerVo<WarehouseAreaVo> p = warehouseAreaFeign.listPage(pq).getData();
         return rb.success().setData(p);
     }
     public ResultBean<List<WarehouseArea>> getAllType(OrgPathQuery query) {

wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseareatype/WarehouseAreaTypeService.java

@@ -48,8 +48,7 @@ public class WarehouseAreaTypeService extends MybatisBaseService<WarehouseAreaTy
         privilegeQuery.setUserSid(query.getUserSid());
         ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
         pq.getParams().setOrgLevelKey(defaultIdReltBean.getData());
-        IPage<WarehouseAreaTypeVo> pagging = warehouseAreaTypeFeign.listPage(pq).getData();
-        PagerVo<WarehouseAreaTypeVo> p = PagerUtil.pageToVo(pagging, null);
+        PagerVo<WarehouseAreaTypeVo> p = warehouseAreaTypeFeign.listPage(pq).getData();
         return rb.success().setData(p);
     }
     public ResultBean<List<WarehouseAreaType>> listAll(OrgPathQuery query) {

wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoService.java

@@ -46,8 +46,7 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
         privilegeQuery.setUserSid(query.getUserSid());
         ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
         pq.getParams().setOrgLevelKey(defaultIdReltBean.getData());
-        IPage<WarehouseInfoVo> pagging = WarehouseFeign.listPage(pq).getData();
-        PagerVo<WarehouseInfoVo> p = PagerUtil.pageToVo(pagging, null);
+        PagerVo<WarehouseInfoVo> p = WarehouseFeign.listPage(pq).getData();
         return rb.success().setData(p);
     }
     public ResultBean<List<WarehouseInfo>> listAll(OrgPathQuery query) {

wms-biz/src/main/java/com/yxt/wms/biz/func/warehouserack/WarehouseRackService.java

@@ -45,10 +45,7 @@ public class WarehouseRackService extends MybatisBaseService<WarehouseRackMapper
         privilegeQuery.setUserSid(query.getUserSid());
         ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
         pq.getParams().setOrgLevelKey(defaultIdReltBean.getData());
-
-        IPage<WarehouseRackVo> pagging = warehouseRackFeign.listPage(pq).getData();
-        PagerVo<WarehouseRackVo> p = PagerUtil.pageToVo(pagging, null);
-        List<WarehouseRackVo> records = pagging.getRecords();
+        PagerVo<WarehouseRackVo> p = warehouseRackFeign.listPage(pq).getData();
         return rb.success().setData(p);
     }
     public ResultBean<WarehouseRackVo> getAllType() {

wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeign.java

@@ -36,6 +36,9 @@ public interface WarehouseAnsBillFeign {
     @PostMapping("saveOrUpdate")
     @ApiOperation("新增修改保存")
     ResultBean<String> saveOrUpdate(@RequestBody WarehouseAnsBillDto dto);
+    @PostMapping("saveBill")
+    @ApiOperation("oms推送预期到货通知单")
+    ResultBean<String> saveBill(@RequestBody WarehouseAnsBillDto dto);
 
    /* @PostMapping("pageList")
     @ApiOperation("收货单据选择")

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<String> saveBill(WarehouseAnsBillDto dto) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<PagerVo<WarehouseAnsBillVo>> listPage(PagerQuery<WarehouseAnsBillQuery> pagerQuery) {
 		return null;

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<IPage<WarehouseAreaVo>> listPage(@RequestBody PagerQuery<WarehouseAreaQuery> query);
+    public ResultBean<PagerVo<WarehouseAreaVo>> listPage(@RequestBody PagerQuery<WarehouseAreaQuery> query);
     @ApiOperation("查询所有的库区")
     @GetMapping("/listAll")
     public ResultBean<List<WarehouseArea>> listAll();

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<IPage<WarehouseAreaTypeVo>> listPage(@RequestBody PagerQuery<WarehouseAreaTypeQuery> pq);
+    public ResultBean<PagerVo<WarehouseAreaTypeVo>> listPage(@RequestBody PagerQuery<WarehouseAreaTypeQuery> pq);
     @ApiOperation("查询所有的")
     @GetMapping("/listAll/{useOrgSid}")
     public ResultBean<List<WarehouseAreaType>> listAll(@PathVariable("useOrgSid")String useOrgSid);

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<IPage<WarehouseInfoVo>> listPage(@RequestBody PagerQuery<WarehouseInfoQuery> pq);
+    public ResultBean<PagerVo<WarehouseInfoVo>> listPage(@RequestBody PagerQuery<WarehouseInfoQuery> pq);
     @ApiOperation("查询所有的仓库")
     @GetMapping("/listAll/{useOrgSid}")
     public ResultBean<List<WarehouseInfo>> listAll(@PathVariable("useOrgSid") String useOrgSid);

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<IPage<WarehouseInfoVo>> listPage(PagerQuery<WarehouseInfoQuery> pq) {
+	public ResultBean<PagerVo<WarehouseInfoVo>> listPage(PagerQuery<WarehouseInfoQuery> pq) {
 		return null;
 	}
 

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<IPage<WarehouseRackVo>> listPage(@RequestBody PagerQuery<WarehouseRackQuery> pq);
+    public ResultBean<PagerVo<WarehouseRackVo>> listPage(@RequestBody PagerQuery<WarehouseRackQuery> pq);
     @ApiOperation("查询所有的库区")
     @GetMapping("/getAllType")
     public ResultBean<WarehouseRackVo> getAllType();