From 84434fa5905c70722978f43f06183b127b8f38d4 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Tue, 6 Aug 2024 14:04:44 +0800 Subject: [PATCH] 1 --- .../PurchaseInventoryBillRest.java | 59 ++++++++ .../apiadmin/aggregation/SystemLogRest.java | 79 ++++++++++ .../aggregation/WarehouseAnsBillRest.java | 10 +- .../PurchaseInventoryBill.java | 60 ++++++++ .../PurchaseInventoryBillDto2.java | 68 +++++++++ .../PurchaseInventoryBillInitVo.java | 66 +++++++++ .../PurchaseInventoryBillMapper.java | 20 +++ .../PurchaseInventoryBillMapper.xml | 18 +++ .../PurchaseInventoryBillPageVo.java | 61 ++++++++ .../PurchaseInventoryBillQuery.java | 42 ++++++ .../PurchaseInventoryBillService.java | 64 +++++++++ .../PurchaseInventoryBillVo.java | 65 +++++++++ .../PurchaseInventoryBillDetail.java | 62 ++++++++ .../PurchaseInventoryBillDetailDto.java | 60 ++++++++ .../PurchaseInventoryBillDetailDto2.java | 69 +++++++++ .../PurchaseInventoryBillDetailMapper.java | 30 ++++ .../PurchaseInventoryBillDetailMapper.xml | 40 ++++++ .../PurchaseInventoryBillDetailQuery.java | 13 ++ .../PurchaseInventoryBillDetailService.java | 135 ++++++++++++++++++ .../PurchaseInventoryBillDetailVo.java | 62 ++++++++ .../yxt/wms/biz/func/systemlog/SystemLog.java | 44 ++++++ .../wms/biz/func/systemlog/SystemLogDto.java | 46 ++++++ .../biz/func/systemlog/SystemLogMapper.java | 38 +++++ .../biz/func/systemlog/SystemLogMapper.xml | 13 ++ .../biz/func/systemlog/SystemLogQuery.java | 44 ++++++ .../biz/func/systemlog/SystemLogService.java | 64 +++++++++ .../wms/biz/func/systemlog/SystemLogVo.java | 44 ++++++ .../WarehouseAndBillDetailVo.java | 65 +++++++++ .../WarehouseAnsBillQuery.java | 2 +- .../WarehouseAnsBillService.java | 8 +- .../portal/systemlog/SystemLogFeign.java | 68 +++++++++ .../systemlog/SystemLogFeignFallback.java | 67 +++++++++ .../PurchaseInventoryBillFeign.java | 48 +++++++ .../PurchaseInventoryBillFeignFallback.java | 59 ++++++++ .../WarehouseAnsBillFeign.java | 9 +- .../WarehouseAnsBillFeignFallback.java | 10 +- 36 files changed, 1695 insertions(+), 17 deletions(-) create mode 100644 wms/src/main/java/com/yxt/wms/apiadmin/aggregation/PurchaseInventoryBillRest.java create mode 100644 wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SystemLogRest.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBill.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillDto2.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillInitVo.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillMapper.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillMapper.xml create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillPageVo.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillQuery.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillService.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillVo.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetail.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailDto.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailDto2.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailMapper.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailMapper.xml create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailQuery.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailService.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailVo.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLog.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLogDto.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLogMapper.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLogMapper.xml create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLogQuery.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLogService.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLogVo.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAndBillDetailVo.java create mode 100644 wms/src/main/java/com/yxt/wms/feign/portal/systemlog/SystemLogFeign.java create mode 100644 wms/src/main/java/com/yxt/wms/feign/portal/systemlog/SystemLogFeignFallback.java create mode 100644 wms/src/main/java/com/yxt/wms/feign/warehouse/purchaseinventorybill/PurchaseInventoryBillFeign.java create mode 100644 wms/src/main/java/com/yxt/wms/feign/warehouse/purchaseinventorybill/PurchaseInventoryBillFeignFallback.java diff --git a/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/PurchaseInventoryBillRest.java b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/PurchaseInventoryBillRest.java new file mode 100644 index 0000000..3895bc0 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/PurchaseInventoryBillRest.java @@ -0,0 +1,59 @@ +package com.yxt.wms.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.wms.biz.func.purchaseinventorybill.*; +import com.yxt.wms.biz.func.purchaseinventorybill.PurchaseInventoryBillQuery; +import com.yxt.wms.biz.func.purchaseinventorybill.PurchaseInventoryBillService; +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/8/1 17:46 + */ +@Api(tags = "采购入库") +@RestController +@RequestMapping("/apiadmin/purchaseinventorybill") +public class PurchaseInventoryBillRest { + @Autowired + PurchaseInventoryBillService purchaseInventoryBillService; + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + return purchaseInventoryBillService.listPage(pq); + } + + @ApiOperation("新增修改保存") + @PostMapping("/saveOrUpdate") + ResultBean saveOrUpdate(@RequestBody PurchaseInventoryBillDto2 dto) { + return purchaseInventoryBillService.saveOrUpdateBill2(dto); + } + + + + @ApiOperation("采购入库单据编辑初始化/详情") + @GetMapping("/selectByBillSid") + ResultBean selectByBillSid(@RequestParam("sid") String sid) { + return purchaseInventoryBillService.selectByBillSid(sid); + } + + @ApiOperation("确认") + @PostMapping("/confirm") + ResultBean confirm(@RequestBody PurchaseInventoryBillDto2 dto) { + return purchaseInventoryBillService.confirm(dto); + } + + @ApiOperation("删除/批量删除") + @DeleteMapping("/delBySids") + ResultBean delBySids(@RequestBody String[] sids) { + return purchaseInventoryBillService.delAllBySids(sids); + } + + +} diff --git a/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SystemLogRest.java b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SystemLogRest.java new file mode 100644 index 0000000..f7c007d --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SystemLogRest.java @@ -0,0 +1,79 @@ +package com.yxt.wms.apiadmin.aggregation; + +import com.yxt.common.base.utils.WebUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.systemlog.*; +import com.yxt.wms.feign.portal.systemlog.SystemLogFeign; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + + +/** + * Project: anrui_portal(门户建设)
+ * File: SystemLogFeignFallback.java
+ * Class: com.yxt.anrui.portal.biz.systemlog.SystemLogRest
+ * Description: 系统日志表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "系统日志表") +@RestController +@RequestMapping("apiadmin/systemlog") +public class SystemLogRest implements SystemLogFeign { + + @Resource + private SystemLogService systemLogService; + + @Override + public ResultBean> listPage(@RequestBody PagerQuery pq){ + return systemLogService.listPageVo(pq); + } + + @Override + public ResultBean> listAll(@RequestBody SystemLogQuery query){ + return systemLogService.listAllVo(query); + } + + @Override + public ResultBean> list(){ + return systemLogService.listVo(); + } + + @Override + public ResultBean save(SystemLogDto dto){ + ResultBean rb = ResultBean.fireFail(); + systemLogService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + public ResultBean update(SystemLogDto dto,String sid){ + ResultBean rb = ResultBean.fireFail(); + systemLogService.updateBySid(dto.toMap(),sid); + return rb.success(); + } + + @Override + public ResultBean del(String ids){ + ResultBean rb = ResultBean.fireFail(); + systemLogService.delByIds(ids); + return rb.success(); + } + + @Override + public ResultBean fetch(String id){ + return systemLogService.fetchByIdVo(id); + } +} diff --git a/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseAnsBillRest.java b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseAnsBillRest.java index 35f6594..8d966d3 100644 --- a/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseAnsBillRest.java +++ b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseAnsBillRest.java @@ -34,13 +34,11 @@ public class WarehouseAnsBillRest { return warehouseAnsBillService.saveOrUpdateBill(dto); } - /* @PostMapping("pageList") + @PostMapping("pageList") @ApiOperation("收货单据选择") - ResultBean> pageList(@RequestBody PagerQuery pagerQuery) { - ResultBean> rb = ResultBean.fireFail(); - PagerVo pv = wmsAnsBillService.listPage(pagerQuery); - return rb.success().setData(pv); - }*/ + ResultBean> pageList(@RequestBody PagerQuery pagerQuery) { + return warehouseAnsBillService.listPageAns(pagerQuery); + } @PostMapping("listPage") @ApiOperation("分页列表") diff --git a/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBill.java b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBill.java new file mode 100644 index 0000000..abddff0 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBill.java @@ -0,0 +1,60 @@ +package com.yxt.wms.biz.func.purchaseinventorybill; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/3 + **/ +@Data +public class PurchaseInventoryBill extends BaseEntity { + + @ApiModelProperty("来源单sid（预约单）") + private String sourceBillSid; + @ApiModelProperty("来源单号（预约单）") + private String sourceBillNo; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("状态") + private String billState; + @ApiModelProperty("商品总额") + private double total; + @ApiModelProperty("商品总重量（kg）") + private double totalWeight; + @ApiModelProperty("总体积(m3)") + private double totalVolume; + @ApiModelProperty("总数") + private double totalQuantity; + @ApiModelProperty("供应商sid") + private String supplierSid; + @ApiModelProperty("供应商") + private String supplierName; + @ApiModelProperty("承运商") + private String carrier; + @ApiModelProperty("运单号") + private String waybillNumber; + @ApiModelProperty("货主") + private String shipper; + @ApiModelProperty("外部单号") + private String externalNo; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("入库时间") + private Date storageTime; + @ApiModelProperty("操作员sid") + private String operatorSid; + @ApiModelProperty("操作员名称") + private String operatorName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("操作时间") + private Date operatorTime; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("创建组织sid") + private String createOrgSid; +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillDto2.java b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillDto2.java new file mode 100644 index 0000000..307cba7 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillDto2.java @@ -0,0 +1,68 @@ +package com.yxt.wms.biz.func.purchaseinventorybill; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.wms.biz.func.purchaseinventorybilldetail.PurchaseInventoryBillDetailDto2; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/15 + **/ +@Data +public class PurchaseInventoryBillDto2 { + private String sid; + @ApiModelProperty("来源单sid（预约单）") + private String sourceBillSid; + @ApiModelProperty("来源单号（预约单）") + private String sourceBillNo; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("状态") + private String billState; + @ApiModelProperty("商品总额") + private double total; + @ApiModelProperty("商品总重量（kg）") + private double totalWeight; + @ApiModelProperty("总体积(m3)") + private double totalVolume; + @ApiModelProperty("总数") + private double totalQuantity; + @ApiModelProperty("供应商sid") + private String supplierSid; + @ApiModelProperty("供应商") + private String supplierName; + @ApiModelProperty("承运商") + private String carrier; + @ApiModelProperty("运单号") + private String waybillNumber; + @ApiModelProperty("货主") + private String shipper; + @ApiModelProperty("外部单号") + private String externalNo; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("入库时间") + private Date storageTime; + @ApiModelProperty("操作员sid") + private String operatorSid; + @ApiModelProperty("操作员名称") + private String operatorName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("操作时间") + private Date operatorTime; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("商品列表") + private List list = new ArrayList<>(); +// @ApiModelProperty("批次列表") +// private List pcList = new ArrayList<>(); +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillInitVo.java b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillInitVo.java new file mode 100644 index 0000000..5d602ec --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillInitVo.java @@ -0,0 +1,66 @@ +package com.yxt.wms.biz.func.purchaseinventorybill; + +import com.fasterxml.jackson.annotation.JsonFormat; + +import com.yxt.wms.biz.func.purchaseinventorybilldetail.PurchaseInventoryBillDetailVo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/15 + **/ +@Data +public class PurchaseInventoryBillInitVo { + + @ApiModelProperty("来源单sid（预约单）") + private String sourceBillSid; + @ApiModelProperty("来源单号（预约单）") + private String sourceBillNo; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("状态") + private String billState; + @ApiModelProperty("商品总额") + private double total; + @ApiModelProperty("商品总重量（kg）") + private double totalWeight; + @ApiModelProperty("总体积(m3)") + private double totalVolume; + @ApiModelProperty("总数") + private double totalQuantity; + @ApiModelProperty("供应商sid") + private String supplierSid; + @ApiModelProperty("供应商") + private String supplierName; + @ApiModelProperty("承运商") + private String carrier; + @ApiModelProperty("运单号") + private String waybillNumber; + @ApiModelProperty("货主") + private String shipper; + @ApiModelProperty("外部单号") + private String externalNo; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("入库时间") + private Date storageTime; + @ApiModelProperty("操作员sid") + private String operatorSid; + @ApiModelProperty("操作员名称") + private String operatorName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("操作时间") + private Date operatorTime; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + private String remarks; + @ApiModelProperty("单据详情") + private List list = new ArrayList<>(); +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillMapper.java b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillMapper.java new file mode 100644 index 0000000..888f751 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillMapper.java @@ -0,0 +1,20 @@ +package com.yxt.wms.biz.func.purchaseinventorybill; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/3 + **/ +@Mapper +public interface PurchaseInventoryBillMapper extends BaseMapper { + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + PurchaseInventoryBillInitVo getDetailsInit(String sid); +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillMapper.xml b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillMapper.xml new file mode 100644 index 0000000..ee56ffb --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillMapper.xml @@ -0,0 +1,18 @@ + + + + + + + \ No newline at end of file diff --git a/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillPageVo.java b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillPageVo.java new file mode 100644 index 0000000..b186110 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillPageVo.java @@ -0,0 +1,61 @@ +package com.yxt.wms.biz.func.purchaseinventorybill; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/12 + **/ +@Data +public class PurchaseInventoryBillPageVo { + + private String sid; + @ApiModelProperty("来源单sid（预约单）") + private String sourceBillSid; + @ApiModelProperty("来源单号（预约单）") + private String sourceBillNo; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("状态") + private String billState; + @ApiModelProperty("商品总额") + private double total; + @ApiModelProperty("商品总重量（kg）") + private double totalWeight; + @ApiModelProperty("总体积(m3)") + private double totalVolume; + @ApiModelProperty("总数") + private double totalQuantity; + @ApiModelProperty("供应商sid") + private String supplierSid; + @ApiModelProperty("供应商") + private String supplierName; + @ApiModelProperty("承运商") + private String carrier; + @ApiModelProperty("运单号") + private String waybillNumber; + @ApiModelProperty("货主") + private String shipper; + @ApiModelProperty("外部单号") + private String externalNo; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("入库时间") + private Date storageTime; + @ApiModelProperty("操作员sid") + private String operatorSid; + @ApiModelProperty("操作员名称") + private String operatorName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("操作时间") + private Date operatorTime; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + private String remarks; +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillQuery.java b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillQuery.java new file mode 100644 index 0000000..4e7fd50 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillQuery.java @@ -0,0 +1,42 @@ +package com.yxt.wms.biz.func.purchaseinventorybill; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/3 + **/ +@Data +public class PurchaseInventoryBillQuery implements Query { + + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("外部单号") + private String externalNo; + @ApiModelProperty("来源单号（入库预约）") + private String sourceBillNo; + @ApiModelProperty("库位sid") + private String warehouseRackSid; + @ApiModelProperty("入库开始时间") + private String storageTimeStart; + @ApiModelProperty("入库结束时间") + private String storageTimeEnd; + @ApiModelProperty("承运商") + private String carrier; + @ApiModelProperty("运单号") + private String waybillNumber; + @ApiModelProperty("商品sid") + private String goodsSkuSid; + @ApiModelProperty("货主") + private String shipper; + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") + private String orgPath; + @ApiModelProperty("用户sid") + private String userSid; + +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillService.java b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillService.java new file mode 100644 index 0000000..86b9839 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillService.java @@ -0,0 +1,64 @@ +package com.yxt.wms.biz.func.purchaseinventorybill; + +import cn.hutool.core.bean.BeanUtil; +import com.alibaba.fastjson.JSON; +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.wms.biz.func.purchaseinventorybilldetail.PurchaseInventoryBillDetailService; +import com.yxt.wms.biz.func.purchaseinventorybilldetail.PurchaseInventoryBillDetailVo; +import com.yxt.wms.biz.func.warehouseansbill.WarehouseAnsBill; +import com.yxt.wms.biz.func.warehouseansbill.WarehouseAnsBillService; +import com.yxt.wms.biz.func.warehouseansbilldetail.WarehouseAnsBillDetailService; +import com.yxt.wms.biz.func.warehouseansbilldetail.WarehouseAnsListDetailsVo; +import com.yxt.wms.biz.func.warehousereceiptbilldetail.WarehouseReceiptBillDetailDto2; +import com.yxt.wms.biz.func.warehousereceiptbilldetail.WarehouseReceiptBillDetailVo; +import com.yxt.wms.biz.func.warehousereceiptbilldetailbatch.WarehouseReceiptBillDetailBatchDto2; +import com.yxt.wms.feign.warehouse.purchaseinventorybill.PurchaseInventoryBillFeign; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.*; +import java.util.stream.Collectors; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/3 + **/ +@Service +public class PurchaseInventoryBillService extends MybatisBaseService { + + @Autowired + private PurchaseInventoryBillFeign purchaseInventoryBillFeign; + + + public ResultBean> listPage(PagerQuery pq) { + + return purchaseInventoryBillFeign.listPage(pq); + } + + public ResultBean saveOrUpdateBill2(PurchaseInventoryBillDto2 dto) { + + return purchaseInventoryBillFeign.saveOrUpdate(dto); + } + + + public ResultBean selectByBillSid(String sid) { + return purchaseInventoryBillFeign.selectByBillSid(sid); + } + + + public ResultBean confirm(PurchaseInventoryBillDto2 dto) { + return purchaseInventoryBillFeign.confirm(dto); + } + + public ResultBean delAllBySids(String[] sids) { + return purchaseInventoryBillFeign.delBySids(sids); + } +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillVo.java b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillVo.java new file mode 100644 index 0000000..41ce0a9 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillVo.java @@ -0,0 +1,65 @@ +package com.yxt.wms.biz.func.purchaseinventorybill; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.wms.biz.func.purchaseinventorybilldetail.PurchaseInventoryBillDetailVo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/3 + **/ +@Data +public class PurchaseInventoryBillVo { + private String sid; + @ApiModelProperty("来源单sid（预约单）") + private String sourceBillSid; + @ApiModelProperty("来源单号（预约单）") + private String sourceBillNo; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("状态") + private String billState; + @ApiModelProperty("商品总额") + private double total; + @ApiModelProperty("商品总重量（kg）") + private double totalWeight; + @ApiModelProperty("总体积(m3)") + private double totalVolume; + @ApiModelProperty("总数") + private double totalQuantity; + @ApiModelProperty("供应商sid") + private String supplierSid; + @ApiModelProperty("供应商") + private String supplierName; + @ApiModelProperty("承运商") + private String carrier; + @ApiModelProperty("运单号") + private String waybillNumber; + @ApiModelProperty("货主") + private String shipper; + @ApiModelProperty("外部单号") + private String externalNo; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("入库时间") + private Date storageTime; + @ApiModelProperty("操作员sid") + private String operatorSid; + @ApiModelProperty("操作员名称") + private String operatorName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("操作时间") + private Date operatorTime; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + private String remarks; + + private List list = new ArrayList<>(); +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetail.java b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetail.java new file mode 100644 index 0000000..968b17a --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetail.java @@ -0,0 +1,62 @@ +package com.yxt.wms.biz.func.purchaseinventorybilldetail; + +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/3 + **/ +@Data +public class PurchaseInventoryBillDetail extends BaseEntity { + private String sid; + @ApiModelProperty("来源单sid") + private String sourceBillSid; + @ApiModelProperty("图示") + private String illustration; + @ApiModelProperty("商品skusid") + private String goodsSkuSid; + @ApiModelProperty("商品名称") + private String goodsName; + @ApiModelProperty("商品编码") + private String goodsCode; + @ApiModelProperty("商品条码") + private String goodsBarCode; + @ApiModelProperty("规格值") + private String specValue; + @ApiModelProperty("箱条码") + private String boxBarCode; + @ApiModelProperty("箱规格") + private String boxSpec; + @ApiModelProperty("单位sid") + private String unitSid; + @ApiModelProperty("单位名称") + private BigDecimal unitName; + @ApiModelProperty("成本单价") + private BigDecimal price; + @ApiModelProperty("总价") + private String totalPrice; + @ApiModelProperty("数量") + private Date count; + @ApiModelProperty("辅助单位") + private Integer auxiliaryUnits; + @ApiModelProperty("序列号") + private Integer serialNumber; + @ApiModelProperty("生产批次号") + private String batchNumber; + + @ApiModelProperty("入库库位sid") + private String warehouseRackSid; + @ApiModelProperty("入库库位名") + private String warehouseRackName; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + private String remarks; +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailDto.java b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailDto.java new file mode 100644 index 0000000..8eaa3ce --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailDto.java @@ -0,0 +1,60 @@ +package com.yxt.wms.biz.func.purchaseinventorybilldetail; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/6/6 16:39 + */ +@Data +public class PurchaseInventoryBillDetailDto { + private String sid; + @ApiModelProperty("来源单sid") + private String sourceBillSid; + @ApiModelProperty("图示") + private String illustration; + @ApiModelProperty("商品skusid") + private String goodsSkuSid; + @ApiModelProperty("商品名称") + private String goodsName; + @ApiModelProperty("商品编码") + private String goodsCode; + @ApiModelProperty("商品条码") + private String goodsBarCode; + @ApiModelProperty("规格值") + private String specValue; + @ApiModelProperty("箱条码") + private String boxBarCode; + @ApiModelProperty("箱规格") + private String boxSpec; + @ApiModelProperty("单位sid") + private String unitSid; + @ApiModelProperty("单位名称") + private BigDecimal unitName; + @ApiModelProperty("成本单价") + private BigDecimal price; + @ApiModelProperty("总价") + private String totalPrice; + @ApiModelProperty("数量") + private Date count; + @ApiModelProperty("辅助单位") + private Integer auxiliaryUnits; + @ApiModelProperty("序列号") + private Integer serialNumber; + @ApiModelProperty("生产批次号") + private String batchNumber; + + @ApiModelProperty("入库库位sid") + private String warehouseRackSid; + @ApiModelProperty("入库库位名") + private String warehouseRackName; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + private String remarks; +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailDto2.java b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailDto2.java new file mode 100644 index 0000000..ee36a93 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailDto2.java @@ -0,0 +1,69 @@ +package com.yxt.wms.biz.func.purchaseinventorybilldetail; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/15 + **/ +@Data +public class PurchaseInventoryBillDetailDto2 { + + @ApiModelProperty("商品Skusid") + private String goodsSkuSid; + @ApiModelProperty("商品Sku名称") + private String goodsSkuTitle; + @ApiModelProperty("商品sku编码") + private String goodsSkuCode; + @ApiModelProperty("规格型号") + private String goodsSkuOwnSpec; + @ApiModelProperty("计量单位") + private String unit; + @ApiModelProperty("仓库sid") + private String warehouseSid; + @ApiModelProperty("仓库名称") + private String warehouseName; + @ApiModelProperty("库位sid") + private String warehouseRackSid; + @ApiModelProperty("库位名称") + private String warehouseRackName; + @ApiModelProperty("实收数量") + private String actualInCount; + @ApiModelProperty("拒收数量") + private String rejectCount; + @ApiModelProperty("拒收原因") + private String rejectReason; + @ApiModelProperty("是否需要质检（不需要0，需要1）") + private Integer isQuality; + @ApiModelProperty("质检状态（合格0，不合格1）") + private Integer qualityState; + @ApiModelProperty("载具说明") + private String packageRemark; + @ApiModelProperty("单据明细状态：0新建，1已完成") + private Integer state; + @ApiModelProperty("序号") + private String xh; + @JsonIgnore + private String detailsSid; + + @ApiModelProperty("预约数量（采购订单数量）") + private String orderCount; + + + //入库价 + @ApiModelProperty("单位成本（采购价）") + private String cost; + @ApiModelProperty("税额") + private String taxAmount; + @ApiModelProperty("含税价") + private String taxPrice; + //采购金额 + @ApiModelProperty("金额") + private String amount; + + @ApiModelProperty("有效天数") + private String shelfLife; +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailMapper.java b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailMapper.java new file mode 100644 index 0000000..346d33a --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailMapper.java @@ -0,0 +1,30 @@ +package com.yxt.wms.biz.func.purchaseinventorybilldetail; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/3 + **/ +@Mapper +public interface PurchaseInventoryBillDetailMapper extends BaseMapper { + int deleteByBillSid(String sid); + + List getDetailsInit(String sid); + + List selectByBillSid(@Param("sid") String sid, @Param("sidList") List sidList); + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + PurchaseInventoryBillDetailVo initialization (@Param("sid") String sid); + + @Delete("delete from warehouse_reportlose where sid = #{sid}") + void delByMainSid(String billSid); +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailMapper.xml b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailMapper.xml new file mode 100644 index 0000000..d437290 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailMapper.xml @@ -0,0 +1,40 @@ + + + + + delete + from pruchase_inventory_bill_detail + where billSid = #{sid} + + + + + + + + \ No newline at end of file diff --git a/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailQuery.java b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailQuery.java new file mode 100644 index 0000000..592ae4b --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailQuery.java @@ -0,0 +1,13 @@ +package com.yxt.wms.biz.func.purchaseinventorybilldetail; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/6/6 16:42 + */ +@Data +public class PurchaseInventoryBillDetailQuery implements Query { + private String name; +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailService.java b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailService.java new file mode 100644 index 0000000..294de15 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailService.java @@ -0,0 +1,135 @@ +package com.yxt.wms.biz.func.purchaseinventorybilldetail; + +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 org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/3 + **/ +@Service +public class PurchaseInventoryBillDetailService extends MybatisBaseService { + + + + public List getDetailsInit(String sid) { + return baseMapper.getDetailsInit(sid); + } + + public List selectByBillSid(String sid, List sidList) { + return baseMapper.selectByBillSid(sid, sidList); + } + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PurchaseInventoryBillDetailQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getName())) { + qw.like("rackName", query.getName()); + } + + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.listPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + List records = pagging.getRecords(); + return rb.success().setData(p); + } + + + + + + public ResultBean saveOrUpdate(PurchaseInventoryBillDetailDto dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = ""; + if (StringUtils.isNotBlank(dto.getSid())) { + sid = dto.getSid(); + PurchaseInventoryBillDetail wmsWarehouseRack = fetchBySid(dto.getSid()); + BeanUtil.copyProperties(dto, wmsWarehouseRack, "id", "sid"); + baseMapper.updateById(wmsWarehouseRack); + } else { + PurchaseInventoryBillDetail wmsWarehouseRack = new PurchaseInventoryBillDetail(); + sid = wmsWarehouseRack.getSid(); + BeanUtil.copyProperties(dto, wmsWarehouseRack, "id", "sid"); + wmsWarehouseRack.setCreateTime(new DateTime()); + baseMapper.insert(wmsWarehouseRack); + } + return rb.success().setMsg("成功"); + } + + public ResultBean initialization(String sid) { + ResultBean rb = ResultBean.fireFail(); + PurchaseInventoryBillDetailVo vo = baseMapper.initialization(sid); + return rb.success().setData(vo); + } + public void delAll(String[] sids) { + delBySids(sids); + } + + public ResultBean delete(String sid) { + ResultBean rb = ResultBean.fireFail(); + PurchaseInventoryBillDetail wmsWarehouseRack = fetchBySid(sid); + if (null != wmsWarehouseRack) { + baseMapper.deleteById(wmsWarehouseRack.getId()); + } + return rb.success(); + } + + public ResultBean updateIsEnable(String sid, String isEnable) { + ResultBean rb = ResultBean.fireFail(); + PurchaseInventoryBillDetail wmsWarehouseRack = fetchBySid(sid); + if (null != wmsWarehouseRack) { + wmsWarehouseRack.setIsEnable(Integer.parseInt(isEnable)); + baseMapper.updateById(wmsWarehouseRack); + } + return rb.success().setMsg("成功"); + } + + public void delByMainSid(String billSid) { + baseMapper.delByMainSid(billSid); + } + + + public void saveOrUpdateDto(PurchaseInventoryBillDetailDto dto) { + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(PurchaseInventoryBillDetailDto dto) { + PurchaseInventoryBillDetail entity = new PurchaseInventoryBillDetail(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(PurchaseInventoryBillDetailDto dto) { + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + } + public PurchaseInventoryBillDetailVo fetchDetailsVoBySid(String sid) { + PurchaseInventoryBillDetail entity = fetchBySid(sid); + PurchaseInventoryBillDetailVo vo = new PurchaseInventoryBillDetailVo(); + BeanUtil.copyProperties(entity, vo); + + return vo; + } +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailVo.java b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailVo.java new file mode 100644 index 0000000..c755832 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailVo.java @@ -0,0 +1,62 @@ +package com.yxt.wms.biz.func.purchaseinventorybilldetail; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/12 + **/ +@Data +public class PurchaseInventoryBillDetailVo { + + private String sid; + @ApiModelProperty("来源单sid") + private String sourceBillSid; + @ApiModelProperty("图示") + private String illustration; + @ApiModelProperty("商品skusid") + private String goodsSkuSid; + @ApiModelProperty("商品名称") + private String goodsName; + @ApiModelProperty("商品编码") + private String goodsCode; + @ApiModelProperty("商品条码") + private String goodsBarCode; + @ApiModelProperty("规格值") + private String specValue; + @ApiModelProperty("箱条码") + private String boxBarCode; + @ApiModelProperty("箱规格") + private String boxSpec; + @ApiModelProperty("单位sid") + private String unitSid; + @ApiModelProperty("单位名称") + private String unitName; + @ApiModelProperty("成本单价") + private BigDecimal price; + @ApiModelProperty("总价") + private BigDecimal totalPrice; + @ApiModelProperty("数量") + private String count; + @ApiModelProperty("辅助单位") + private String auxiliaryUnits; + @ApiModelProperty("序列号") + private String serialNumber; + @ApiModelProperty("生产批次号") + private String batchNumber; + + @ApiModelProperty("入库库位sid") + private String warehouseRackSid; + @ApiModelProperty("入库库位名") + private String warehouseRackName; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + private String remarks; + +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLog.java b/wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLog.java new file mode 100644 index 0000000..5f6aac4 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLog.java @@ -0,0 +1,44 @@ +package com.yxt.wms.biz.func.systemlog; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SystemLog.java
+ * Class: com.yxt.anrui.portal.api.systemlog.SystemLog
+ * Description: 系统日志表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "系统日志表", description = "系统日志表") +@TableName("system_log") +@Data +public class SystemLog extends BaseEntity { + private static final long serialVersionUID = 1L; + @ApiModelProperty("事件名称或类别") + private String eventName; + + @ApiModelProperty("事件内容") + private String eventContent; + + @ApiModelProperty("事件url") + private String eventUrl; + + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("用户名") + private String userName; + + @ApiModelProperty("用户iP") + private String userIp; +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLogDto.java b/wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLogDto.java new file mode 100644 index 0000000..8625238 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLogDto.java @@ -0,0 +1,46 @@ +package com.yxt.wms.biz.func.systemlog; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Builder; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SystemLogDto.java
+ * Class: com.yxt.anrui.portal.api.systemlog.SystemLogDto
+ * Description: 系统日志表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Builder +@ApiModel(value = "系统日志表 数据传输对象", description = "系统日志表 数据传输对象") +@Data +public class SystemLogDto implements Dto { + + + @ApiModelProperty("事件名称或类别") + private String eventName; + + @ApiModelProperty("事件内容") + private String eventContent; + + @ApiModelProperty("事件url") + private String eventUrl; + + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("用户名") + private String userName; + + @ApiModelProperty("用户iP") + private String userIp; +} \ No newline at end of file diff --git a/wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLogMapper.java b/wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLogMapper.java new file mode 100644 index 0000000..b06f227 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLogMapper.java @@ -0,0 +1,38 @@ +package com.yxt.wms.biz.func.systemlog; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SystemLogMapper.java
+ * Class: com.yxt.anrui.portal.biz.systemlog.SystemLogMapper
+ * Description: 系统日志表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface SystemLogMapper extends BaseMapper { + + //@Update("update system_log set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from system_log") + List selectListVo(); +} \ No newline at end of file diff --git a/wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLogMapper.xml b/wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLogMapper.xml new file mode 100644 index 0000000..0266856 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLogMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLogQuery.java b/wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLogQuery.java new file mode 100644 index 0000000..9f4e209 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLogQuery.java @@ -0,0 +1,44 @@ +package com.yxt.wms.biz.func.systemlog; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SystemLogQuery.java
+ * Class: com.yxt.anrui.portal.api.systemlog.SystemLogQuery
+ * Description: 系统日志表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "系统日志表 查询条件", description = "系统日志表 查询条件") +@Data +public class SystemLogQuery implements Query { + + + @ApiModelProperty("事件名称或类别") + private String eventName; + + @ApiModelProperty("事件内容") + private String eventContent; + + @ApiModelProperty("事件url") + private String eventUrl; + + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("用户名") + private String userName; + + @ApiModelProperty("用户iP") + private String userIp; +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLogService.java b/wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLogService.java new file mode 100644 index 0000000..8df6e7a --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLogService.java @@ -0,0 +1,64 @@ +package com.yxt.wms.biz.func.systemlog; + +import cn.hutool.core.bean.BeanUtil; +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.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.feign.portal.systemlog.SystemLogFeign; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + * Project: anrui_portal(门户建设)
+ * File: SystemLogService.java
+ * Class: com.yxt.anrui.portal.biz.systemlog.SystemLogService
+ * Description: 系统日志表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class SystemLogService extends MybatisBaseService { + @Autowired + SystemLogFeign systemLogFeign; + public ResultBean> listPage(PagerQuery pq) { + return systemLogFeign.listPage(pq); + } + public ResultBean> listAll(SystemLogQuery query) { + return systemLogFeign.list(); + } + + + public ResultBean> listPageVo(PagerQuery pq) { + + return systemLogFeign.listPage(pq); + } + + public ResultBean> listAllVo(SystemLogQuery query) { + return systemLogFeign.listAll(query); + } + + public ResultBean> listVo() { + return systemLogFeign.list(); + } + + public void saveOrUpdateDto(SystemLogDto dto){ + systemLogFeign.save(dto); + } + + public ResultBean fetchByIdVo(String id){ + return systemLogFeign.fetch(id); + } +} \ No newline at end of file diff --git a/wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLogVo.java b/wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLogVo.java new file mode 100644 index 0000000..c113501 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLogVo.java @@ -0,0 +1,44 @@ +package com.yxt.wms.biz.func.systemlog; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SystemLogVo.java
+ * Class: com.yxt.anrui.portal.api.systemlog.SystemLogVo
+ * Description: 系统日志表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "系统日志表 视图数据对象", description = "系统日志表 视图数据对象") +@Data +public class SystemLogVo implements Vo { + + + @ApiModelProperty("事件名称或类别") + private String eventName; + + @ApiModelProperty("事件内容") + private String eventContent; + + @ApiModelProperty("事件url") + private String eventUrl; + + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("用户名") + private String userName; + + @ApiModelProperty("用户iP") + private String userIp; +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAndBillDetailVo.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAndBillDetailVo.java new file mode 100644 index 0000000..4aeca03 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAndBillDetailVo.java @@ -0,0 +1,65 @@ +package com.yxt.wms.biz.func.warehouseansbill; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.wms.biz.func.warehouseansbilldetail.WarehouseAnsBillDetail; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/8/5 9:43 + */ +@Data +public class WarehouseAndBillDetailVo { + private String sid; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("申请时间") + private Date applicationTime; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("业务类型key（采购入库、收货入库、其他入库）") + private String busTypeKey; + @ApiModelProperty("业务类型value（采购入库、收货入库、其他入库）") + private String busTypeKeyValue; + + @ApiModelProperty("货物状态（在途、部分收货、已收货、已取消）") + private Integer billState; + private String billStateValue; + @ApiModelProperty("仓库sid") + private String warehouseSid; + @ApiModelProperty("仓库名") + private String warehouseName; + @ApiModelProperty("库区sid") + private String warehouseRackSid; + @ApiModelProperty("库区名") + private String warehouseRackName; + @ApiModelProperty("申请人") + private String applicant; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("预约时间") + private Date reservationTime; + @ApiModelProperty("供应商sid") + private String supplierSid; + @ApiModelProperty("供应商") + private String supplierName; + @ApiModelProperty("外部单号") + private String sourceBillNo; + @ApiModelProperty("联系人") + private String contact; + @ApiModelProperty("联系电话") + private String mobile; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + private String remarks; + @ApiModelProperty("承运商") + private String carrier; + @ApiModelProperty("运单号") + private String waybillNumber; + List warehouseAnsBillDetails =new ArrayList<>(); +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillQuery.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillQuery.java index 6a0bf59..922b754 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillQuery.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillQuery.java @@ -32,7 +32,7 @@ public class WarehouseAnsBillQuery implements Query { private String waybillNumber; @ApiModelProperty("承运商") private String carrier; - @ApiModelProperty("库区sid") + @ApiModelProperty("库位sid") private String warehouseRackSid; private String orgLevelKey;//权限等级 diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillService.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillService.java index b75aa47..5b7529e 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillService.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillService.java @@ -48,7 +48,13 @@ public class WarehouseAnsBillService extends MybatisBaseService> listPageAns(PagerQuery pq) { + WarehouseAnsBillQuery query=pq.getParams(); + DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData(); + pq.getParams().setOrgLevelKey(dataRule.getDataRuleId()); + pq.getParams().setIndex(dataRule.getIndex()); + return wmsAnsBillFeign.listPageAns(pq); + } public ResultBean> listPages(PagerQuery pq) { WarehouseAnsBillQuery query=pq.getParams(); DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData(); diff --git a/wms/src/main/java/com/yxt/wms/feign/portal/systemlog/SystemLogFeign.java b/wms/src/main/java/com/yxt/wms/feign/portal/systemlog/SystemLogFeign.java new file mode 100644 index 0000000..ca078c0 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/feign/portal/systemlog/SystemLogFeign.java @@ -0,0 +1,68 @@ +package com.yxt.wms.feign.portal.systemlog; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.systemlog.SystemLogDto; +import com.yxt.wms.biz.func.systemlog.SystemLogQuery; +import com.yxt.wms.biz.func.systemlog.SystemLogVo; +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.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; + + +/** + * Project: anrui_portal(门户建设)
+ * File: SystemLogFeign.java
+ * Class: com.yxt.anrui.portal.api.systemlog.SystemLogFeign
+ * Description: 系统日志表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "系统日志表") +@FeignClient( + contextId = "ss-common-portal-SystemLog", + name = "ss-common-portal", + path = "/apiadmin/systemlog", + fallback = SystemLogFeignFallback.class) +public interface SystemLogFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("根据条件查询所有数据列表") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody SystemLogQuery query); + + @ApiOperation("所有数据列表") + @GetMapping("/list") + public ResultBean> list(); + + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@RequestBody SystemLogDto dto); + + @ApiOperation("修改保存") + @PostMapping("/update/{sid}") + public ResultBean update(@RequestBody SystemLogDto dto,@PathVariable("sid") String sid); + + @ApiOperation("删除记录") + @GetMapping("/del/{ids}") + public ResultBean del(@PathVariable("ids") String ids); + + @ApiOperation("获取一条记录") + @GetMapping("/fetch/{id}") + public ResultBean fetch(@PathVariable("id") String id); +} \ No newline at end of file diff --git a/wms/src/main/java/com/yxt/wms/feign/portal/systemlog/SystemLogFeignFallback.java b/wms/src/main/java/com/yxt/wms/feign/portal/systemlog/SystemLogFeignFallback.java new file mode 100644 index 0000000..8cf7ea3 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/feign/portal/systemlog/SystemLogFeignFallback.java @@ -0,0 +1,67 @@ +package com.yxt.wms.feign.portal.systemlog; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.systemlog.SystemLogDto; +import com.yxt.wms.biz.func.systemlog.SystemLogQuery; +import com.yxt.wms.biz.func.systemlog.SystemLogVo; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SystemLogFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.systemlog.SystemLogFeignFallback
+ * Description: 系统日志表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class SystemLogFeignFallback implements SystemLogFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/systemlog/listPage无法访问"); + } + + @Override + public ResultBean> listAll(SystemLogQuery query){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/systemlog/listAll无法访问"); + } + + @Override + public ResultBean> list(){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/systemlog/list无法访问"); + } + + @Override + public ResultBean save(SystemLogDto dto){ + return ResultBean.fireFail().setMsg("接口anrui_portal/systemlog/save无法访问"); + } + + @Override + public ResultBean update(SystemLogDto dto, String sid){ + return ResultBean.fireFail().setMsg("接口anrui_portal/systemlog/update无法访问"); + } + + @Override + public ResultBean del(String ids){ + return ResultBean.fireFail().setMsg("接口anrui_portal/systemlog/del无法访问"); + } + + @Override + public ResultBean fetch(String id){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui_portal/systemlog/fetch无法访问"); + } +} \ No newline at end of file diff --git a/wms/src/main/java/com/yxt/wms/feign/warehouse/purchaseinventorybill/PurchaseInventoryBillFeign.java b/wms/src/main/java/com/yxt/wms/feign/warehouse/purchaseinventorybill/PurchaseInventoryBillFeign.java new file mode 100644 index 0000000..68ee884 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/feign/warehouse/purchaseinventorybill/PurchaseInventoryBillFeign.java @@ -0,0 +1,48 @@ +package com.yxt.wms.feign.warehouse.purchaseinventorybill; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.operationrecord.OperationRecordDto; +import com.yxt.wms.biz.func.operationrecord.OperationRecordVo; +import com.yxt.wms.biz.func.purchaseinventorybill.PurchaseInventoryBillDto2; +import com.yxt.wms.biz.func.purchaseinventorybill.PurchaseInventoryBillInitVo; +import com.yxt.wms.biz.func.purchaseinventorybill.PurchaseInventoryBillPageVo; +import com.yxt.wms.biz.func.purchaseinventorybill.PurchaseInventoryBillQuery; +import com.yxt.wms.biz.func.purchaseinventorybilldetail.PurchaseInventoryBillDetailVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@Api(tags = "预期到货通知单") +@FeignClient( + contextId = "ss-common-warehouse-PurchaseInventoryBill", + name = "ss-common-warehouse", + path = "/apiadmin/purchaseinventorybill", + fallback = PurchaseInventoryBillFeignFallback.class) +public interface PurchaseInventoryBillFeign { + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增修改保存") + @PostMapping("/saveOrUpdate") + ResultBean saveOrUpdate(@RequestBody PurchaseInventoryBillDto2 dto); + + + @ApiOperation("采购入库单据编辑初始化/详情") + @GetMapping("/selectByBillSid") + ResultBean selectByBillSid(@RequestParam("sid") String sid); + + @ApiOperation("确认") + @PostMapping("/confirm") + ResultBean confirm(@RequestBody PurchaseInventoryBillDto2 dto); + + @ApiOperation("删除/批量删除") + @DeleteMapping("/delBySids") + ResultBean delBySids(@RequestBody String[] sids); + +} \ No newline at end of file diff --git a/wms/src/main/java/com/yxt/wms/feign/warehouse/purchaseinventorybill/PurchaseInventoryBillFeignFallback.java b/wms/src/main/java/com/yxt/wms/feign/warehouse/purchaseinventorybill/PurchaseInventoryBillFeignFallback.java new file mode 100644 index 0000000..09a0730 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/feign/warehouse/purchaseinventorybill/PurchaseInventoryBillFeignFallback.java @@ -0,0 +1,59 @@ +package com.yxt.wms.feign.warehouse.purchaseinventorybill; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.operationrecord.OperationRecordDto; +import com.yxt.wms.biz.func.operationrecord.OperationRecordVo; +import com.yxt.wms.biz.func.purchaseinventorybill.PurchaseInventoryBillDto2; +import com.yxt.wms.biz.func.purchaseinventorybill.PurchaseInventoryBillInitVo; +import com.yxt.wms.biz.func.purchaseinventorybill.PurchaseInventoryBillPageVo; +import com.yxt.wms.biz.func.purchaseinventorybill.PurchaseInventoryBillQuery; +import com.yxt.wms.biz.func.purchaseinventorybilldetail.PurchaseInventoryBillDetailVo; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeignFallback
+ * 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 + */ +@Component +public class PurchaseInventoryBillFeignFallback implements PurchaseInventoryBillFeign { + + + @Override + public ResultBean> listPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean saveOrUpdate(PurchaseInventoryBillDto2 dto) { + return null; + } + + @Override + public ResultBean selectByBillSid(String sid) { + return null; + } + + + @Override + public ResultBean confirm(PurchaseInventoryBillDto2 dto) { + return null; + } + + @Override + public ResultBean delBySids(String[] sids) { + return null; + } +} \ No newline at end of file diff --git a/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeign.java b/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeign.java index b34ac3a..34a6cdd 100644 --- a/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeign.java +++ b/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeign.java @@ -3,10 +3,7 @@ package com.yxt.wms.feign.warehouse.warehouseansbill; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.wms.biz.func.warehouseansbill.WarehouseAnsBillDto; -import com.yxt.wms.biz.func.warehouseansbill.WarehouseAnsBillQuery; -import com.yxt.wms.biz.func.warehouseansbill.WarehouseAnsBillVo; -import com.yxt.wms.biz.func.warehouseansbill.WarehouseAnsDetailsVo; +import com.yxt.wms.biz.func.warehouseansbill.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; @@ -38,7 +35,9 @@ public interface WarehouseAnsBillFeign { @PostMapping("listPage") @ApiOperation("分页列表") ResultBean> listPage(@RequestBody PagerQuery pagerQuery); - + @PostMapping("listPageAns") + @ApiOperation("选择预约单分页列表") + ResultBean> listPageAns(@RequestBody PagerQuery pagerQuery); @GetMapping("details") @ApiOperation("详情") ResultBean details(@RequestParam("sid") String sid); diff --git a/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeignFallback.java b/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeignFallback.java index c423a20..b252f7b 100644 --- a/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeignFallback.java +++ b/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeignFallback.java @@ -3,10 +3,7 @@ package com.yxt.wms.feign.warehouse.warehouseansbill; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.wms.biz.func.warehouseansbill.WarehouseAnsBillDto; -import com.yxt.wms.biz.func.warehouseansbill.WarehouseAnsBillQuery; -import com.yxt.wms.biz.func.warehouseansbill.WarehouseAnsBillVo; -import com.yxt.wms.biz.func.warehouseansbill.WarehouseAnsDetailsVo; +import com.yxt.wms.biz.func.warehouseansbill.*; import org.springframework.stereotype.Component; /** @@ -40,6 +37,11 @@ public class WarehouseAnsBillFeignFallback implements WarehouseAnsBillFeign { return null; } + @Override + public ResultBean> listPageAns(PagerQuery pagerQuery) { + return null; + } + @Override public ResultBean details(String sid) { return null;