6/28

src/main/java/com/yxt/warehouse/apiadmin/WarehouseAnsBillRest.java

@@ -42,6 +42,10 @@ public class WarehouseAnsBillRest {
     ResultBean<WarehouseAnsDetailsVo> details(@RequestParam("sid") String sid) {
         return wmsAnsBillService.details(sid);
     }
-
+    @PostMapping("/saveBill")
+    @ApiOperation("保存预期到通知单")
+    ResultBean<String> saveBill(@RequestBody WarehouseAnsBillDto dto) {
+        return wmsAnsBillService.saveBill(dto);
+    }
 
 }

src/main/java/com/yxt/warehouse/apiadmin/WarehouseAreaRest.java

@@ -27,7 +27,7 @@ public class WarehouseAreaRest {
 
     @ApiOperation("分页列表")
     @PostMapping("/listPage")
-    public ResultBean<IPage<WarehouseAreaVo>> listPage(@RequestBody PagerQuery<WarehouseAreaQuery> pq) {
+    public ResultBean<PagerVo<WarehouseAreaVo>> listPage(@RequestBody PagerQuery<WarehouseAreaQuery> pq) {
         return wmsWarehouseAreaService.listPage(pq);
     }
     @ApiOperation("查询所有的库区")

src/main/java/com/yxt/warehouse/apiadmin/WarehouseAreaTypeRest.java

@@ -27,7 +27,7 @@ public class WarehouseAreaTypeRest {
 
     @ApiOperation("分页列表")
     @PostMapping("/listPage")
-    public ResultBean<IPage<WarehouseAreaTypeVo>> listPage(@RequestBody PagerQuery<WarehouseAreaTypeQuery> pq) {
+    public ResultBean<PagerVo<WarehouseAreaTypeVo>> listPage(@RequestBody PagerQuery<WarehouseAreaTypeQuery> pq) {
         return wmsWarehouseAreaTypeService.listPage(pq);
     }
     @ApiOperation("查询所有的")

src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java

@@ -29,7 +29,7 @@ public class WarehouseInfoRest {
 
     @ApiOperation("分页列表")
     @PostMapping("/listPage")
-    public ResultBean<IPage<WarehouseInfoVo>> listPage(@RequestBody PagerQuery<WarehouseInfoQuery> pq) {
+    public ResultBean<PagerVo<WarehouseInfoVo>> listPage(@RequestBody PagerQuery<WarehouseInfoQuery> pq) {
         return wmsWarehouseService.listPage(pq);
     }
     @ApiOperation("查询所有的仓库")

src/main/java/com/yxt/warehouse/apiadmin/WarehouseRackRest.java

@@ -25,7 +25,7 @@ public class WarehouseRackRest {
 
     @ApiOperation("分页列表")
     @PostMapping("/listPage")
-    public ResultBean<IPage<WarehouseRackVo>> listPage(@RequestBody PagerQuery<WarehouseRackQuery> pq) {
+    public ResultBean<PagerVo<WarehouseRackVo>> listPage(@RequestBody PagerQuery<WarehouseRackQuery> pq) {
         return wmsWarehouseRackService.listPage(pq);
     }
     @ApiOperation("查询所有的库区")

src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBill.java

@@ -1,5 +1,6 @@
 package com.yxt.warehouse.biz.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;

src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillService.java

@@ -122,4 +122,20 @@ public class WarehouseAnsBillService extends MybatisBaseService<WarehouseAnsBill
         }
         return rb.success().setData(WarehouseAnsDetailsVo);
     }
+    public ResultBean<String> saveBill(WarehouseAnsBillDto dto) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        String sid = dto.getSid();
+        WarehouseAnsBill WarehouseAnsBill = new WarehouseAnsBill();
+        BeanUtil.copyProperties(dto, WarehouseAnsBill, "sid");
+        sid = WarehouseAnsBill.getSid();
+        List<WarehouseAnsBillDetailDto> StorageAnsBillDetailList = dto.getStorageAnsBillDetailList();
+        StorageAnsBillDetailList.removeAll(Collections.singleton(null));
+        if (!StorageAnsBillDetailList.isEmpty()) {
+            WarehouseAnsBillDetailService.saveOrUpdateDetailsList(sid, StorageAnsBillDetailList);
+        } else {
+            return rb.setMsg("单据明细不能为空");
+        }
+        baseMapper.insert(WarehouseAnsBill);
+        return rb;
+    }
 }

src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillVo.java

@@ -1,5 +1,6 @@
 package com.yxt.warehouse.biz.warehouseansbill;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -50,6 +51,7 @@ public class WarehouseAnsBillVo {
     @ApiModelProperty("货主")
     private String goodsOwner;
     @ApiModelProperty("预计到货日期")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date deliveryDate;
     @ApiModelProperty("使用组织sid")
     private String useOrgSid;

src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsDetailsVo.java

@@ -1,5 +1,6 @@
 package com.yxt.warehouse.biz.warehouseansbill;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.warehouse.biz.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;
 
     //单据状态

src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaService.java

@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
 public class WarehouseAreaService extends MybatisBaseService<WarehouseAreaMapper, WarehouseArea> {
 
 
-    public ResultBean<IPage<WarehouseAreaVo>> listPage(PagerQuery<WarehouseAreaQuery> pq) {
+    public ResultBean<PagerVo<WarehouseAreaVo>> listPage(PagerQuery<WarehouseAreaQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         WarehouseAreaQuery query = pq.getParams();
         QueryWrapper<WarehouseArea> qw = new QueryWrapper<>();
@@ -41,42 +41,47 @@ public class WarehouseAreaService extends MybatisBaseService<WarehouseAreaMapper
             String orgLevelKey = query.getOrgLevelKey();
             if ("1".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, i1);
-                qw.like("s.orgSidPath", orgSidPath);
+                qw.like("orgSidPath", orgSidPath);
             } else if ("2".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, i2);
-                qw.like("s.orgSidPath", orgSidPath);
+                qw.like("orgSidPath", orgSidPath);
             } else if ("3".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, i3);
-                qw.like("s.orgSidPath", orgSidPath);
+                qw.like("orgSidPath", orgSidPath);
             } else if ("4".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, i4);
-                qw.like("s.orgSidPath", orgSidPath);
+                qw.like("orgSidPath", orgSidPath);
             } else if ("5".equals(orgLevelKey)) {
-                qw.eq("a.createBySid", query.getUserSid());
+                qw.eq("createBySid", query.getUserSid());
             } else {
                 PagerVo<WarehouseAreaVo> p = new PagerVo<>();
                 return rb.success().setData(p);
             }
-        } else {
-            PagerVo<WarehouseAreaVo> p = new PagerVo<>();
-            return rb.success().setData(p);
         }
+//        else {
+//            PagerVo<WarehouseAreaVo> p = new PagerVo<>();
+//            return rb.success().setData(p);
+//        }
         if (StringUtils.isNotBlank(query.getName())) {
-            qw.like("a.areaName", query.getName());
+            qw.like("areaName", query.getName());
         }
         if (StringUtils.isNotBlank(query.getCode())) {
-            qw.like("a.areaCode", query.getCode());
+            qw.like("areaCode", query.getCode());
         }
         if (StringUtils.isNotBlank(query.getWarehouseSid())) {
-            qw.eq("b.sid", query.getWarehouseSid());
+            qw.eq("sid", query.getWarehouseSid());
         }
         if (StringUtils.isNotBlank(query.getAreaTypeSid())) {
-            qw.eq("c.sid", query.getAreaTypeSid());
+            qw.eq("sid", query.getAreaTypeSid());
         }
-        qw.ne("a.isDelete", "1");
+        if (StringUtils.isNotBlank(query.getOrgPath())) {
+            qw.like("useOrgSid", query.getOrgPath());
+        }
+        qw.ne("isDelete", "1");
         IPage<WarehouseArea> page = PagerUtil.queryToPage(pq);
         IPage<WarehouseAreaVo> pagging = baseMapper.listPage(page, qw);
-        return rb.success().setData(pagging);
+        PagerVo<WarehouseAreaVo> p = PagerUtil.pageToVo(pagging, null);
+        return rb.success().setData(p);
     }
     public ResultBean<WarehouseAreaVo> getAllType() {
         ResultBean rb = ResultBean.fireFail();

src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeService.java

@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
 public class WarehouseAreaTypeService extends MybatisBaseService<WarehouseAreaTypeMapper, WarehouseAreaType> {
 
 
-    public ResultBean<IPage<WarehouseAreaTypeVo>> listPage(PagerQuery<WarehouseAreaTypeQuery> pq) {
+    public ResultBean<PagerVo<WarehouseAreaTypeVo>> listPage(PagerQuery<WarehouseAreaTypeQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         WarehouseAreaTypeQuery query = pq.getParams();
         QueryWrapper<WarehouseAreaType> qw = new QueryWrapper<>();
@@ -41,32 +41,37 @@ public class WarehouseAreaTypeService extends MybatisBaseService<WarehouseAreaTy
             String orgLevelKey = query.getOrgLevelKey();
             if ("1".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, i1);
-                qw.like("s.orgSidPath", orgSidPath);
+                qw.like("orgSidPath", orgSidPath);
             } else if ("2".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, i2);
-                qw.like("s.orgSidPath", orgSidPath);
+                qw.like("orgSidPath", orgSidPath);
             } else if ("3".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, i3);
-                qw.like("s.orgSidPath", orgSidPath);
+                qw.like("orgSidPath", orgSidPath);
             } else if ("4".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, i4);
-                qw.like("s.orgSidPath", orgSidPath);
+                qw.like("orgSidPath", orgSidPath);
             } else if ("5".equals(orgLevelKey)) {
-                qw.eq("a.createBySid", query.getUserSid());
+                qw.eq("createBySid", query.getUserSid());
             } else {
                 PagerVo<WarehouseAreaTypeVo> p = new PagerVo<>();
                 return rb.success().setData(p);
             }
-        } else {
-            PagerVo<WarehouseAreaTypeVo> p = new PagerVo<>();
-            return rb.success().setData(p);
         }
+//        else {
+//            PagerVo<WarehouseAreaTypeVo> p = new PagerVo<>();
+//            return rb.success().setData(p);
+//        }
         if(StringUtils.isNotBlank(query.getName())){
-            qw.like("a.warehouseAreaTypeName",query.getName());
+            qw.like("warehouseAreaTypeName",query.getName());
+        }
+        qw.ne("isDelete","1");
+        if (StringUtils.isNotBlank(query.getOrgPath())) {
+            qw.like("useOrgSid", query.getOrgPath());
         }
-        qw.ne("a.isDelete","1");
         IPage<WarehouseAreaType> page = PagerUtil.queryToPage(pq);
         IPage<WarehouseAreaTypeVo> pagging = baseMapper.listPage(page, qw);
+        PagerVo<WarehouseAreaTypeVo> p = PagerUtil.pageToVo(pagging, null);
         return rb.success().setData(pagging);
     }
     public ResultBean<List<WarehouseAreaType>> listAll(String useOrgSid) {

src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java

@@ -36,7 +36,7 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
     @Autowired
     WarehouseExtendService wmsWarehouseExtendService;
 
-    public ResultBean<IPage<WarehouseInfoVo>> listPage(PagerQuery<WarehouseInfoQuery> pq) {
+    public ResultBean<PagerVo<WarehouseInfoVo>> listPage(PagerQuery<WarehouseInfoQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         WarehouseInfoQuery query = pq.getParams();
         QueryWrapper<WarehouseInfo> qw = new QueryWrapper<>();
@@ -51,40 +51,45 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
             String orgLevelKey = query.getOrgLevelKey();
             if ("1".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, i1);
-                qw.like("s.orgSidPath", orgSidPath);
+                qw.like("orgSidPath", orgSidPath);
             } else if ("2".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, i2);
-                qw.like("s.orgSidPath", orgSidPath);
+                qw.like("orgSidPath", orgSidPath);
             } else if ("3".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, i3);
-                qw.like("s.orgSidPath", orgSidPath);
+                qw.like("orgSidPath", orgSidPath);
             } else if ("4".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, i4);
-                qw.like("s.orgSidPath", orgSidPath);
+                qw.like("orgSidPath", orgSidPath);
             } else if ("5".equals(orgLevelKey)) {
-                qw.eq("w.createBySid", query.getUserSid());
+                qw.eq("createBySid", query.getUserSid());
             } else {
                 PagerVo<WarehouseInfoVo> p = new PagerVo<>();
                 return rb.success().setData(p);
             }
-        } else {
-            PagerVo<WarehouseInfoVo> p = new PagerVo<>();
-            return rb.success().setData(p);
         }
+//        else {
+//            PagerVo<WarehouseInfoVo> p = new PagerVo<>();
+//            return rb.success().setData(p);
+//        }
         if (StringUtils.isNotBlank(query.getName())) {
-            qw.like("w.warehouseName", query.getName());
+            qw.like("warehouseName", query.getName());
         }
         if (StringUtils.isNotBlank(query.getCode())) {
-            qw.like("w.warehouseCode", query.getCode());
+            qw.like("warehouseCode", query.getCode());
         }
         if (StringUtils.isNotBlank(query.getAddress())) {
-            qw.like("w.address", query.getAddress());
+            qw.like("address", query.getAddress());
+        }
+        if (StringUtils.isNotBlank(query.getOrgPath())) {
+            qw.like("useOrgSid", query.getOrgPath());
         }
         qw.ne("isDelete",1);
         qw.orderByDesc("sortNo");
         IPage<WarehouseInfo> page = PagerUtil.queryToPage(pq);
         IPage<WarehouseInfoVo> pagging = baseMapper.listPage(page, qw);
-        return rb.success().setData(pagging);
+        PagerVo<WarehouseInfoVo> p = PagerUtil.pageToVo(pagging, null);
+        return rb.success().setData(p);
     }
     public ResultBean<List<WarehouseInfo>> listAll(String useOrgSid) {
         ResultBean rb = ResultBean.fireFail();

src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackService.java

@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
 public class WarehouseRackService extends MybatisBaseService<WarehouseRackMapper, WarehouseRack> {
 
 
-    public ResultBean<IPage<WarehouseRackVo>> listPage( PagerQuery<WarehouseRackQuery> pq) {
+    public ResultBean<PagerVo<WarehouseRackVo>> listPage( PagerQuery<WarehouseRackQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         WarehouseRackQuery query = pq.getParams();
         QueryWrapper<WarehouseRack> qw = new QueryWrapper<>();
@@ -41,18 +41,18 @@ public class WarehouseRackService extends MybatisBaseService<WarehouseRackMapper
             String orgLevelKey = query.getOrgLevelKey();
             if ("1".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, i1);
-                qw.like("s.orgSidPath", orgSidPath);
+                qw.like("orgSidPath", orgSidPath);
             } else if ("2".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, i2);
-                qw.like("s.orgSidPath", orgSidPath);
+                qw.like("orgSidPath", orgSidPath);
             } else if ("3".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, i3);
-                qw.like("s.orgSidPath", orgSidPath);
+                qw.like("orgSidPath", orgSidPath);
             } else if ("4".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, i4);
-                qw.like("s.orgSidPath", orgSidPath);
+                qw.like("orgSidPath", orgSidPath);
             } else if ("5".equals(orgLevelKey)) {
-                qw.eq("a.createBySid", query.getUserSid());
+                qw.eq("createBySid", query.getUserSid());
             } else {
                 PagerVo<WarehouseRackVo> p = new PagerVo<>();
                 return rb.success().setData(p);
@@ -68,15 +68,19 @@ public class WarehouseRackService extends MybatisBaseService<WarehouseRackMapper
             qw.like("rackCode", query.getCode());
         }
         if (StringUtils.isNotBlank(query.getAreaTypeSid())) {
-            qw.eq("b.sid", query.getAreaTypeSid());
+            qw.eq("sid", query.getAreaTypeSid());
         }
         if (StringUtils.isNotBlank(query.getWarehouseSid())) {
-            qw.eq("c.sid", query.getWarehouseSid());
+            qw.eq("sid", query.getWarehouseSid());
+        }
+        qw.ne("isDelete", "1");
+        if (StringUtils.isNotBlank(query.getOrgPath())) {
+            qw.like("useOrgSid", query.getOrgPath());
         }
-        qw.ne("a.isDelete", "1");
         IPage<WarehouseRack> page = PagerUtil.queryToPage(pq);
         IPage<WarehouseRackVo> pagging = baseMapper.listPage(page,qw);
-        return rb.success().setData(pagging);
+        PagerVo<WarehouseRackVo> p = PagerUtil.pageToVo(pagging, null);
+        return rb.success().setData(p);
     }
     public ResultBean<WarehouseRackVo> getAllType() {
         ResultBean rb = ResultBean.fireFail();