diff --git a/src/main/java/com/yxt/warehouse/apiadmin/OperationRecordRest.java b/src/main/java/com/yxt/warehouse/apiadmin/OperationRecordRest.java new file mode 100644 index 0000000..d780f49 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/apiadmin/OperationRecordRest.java @@ -0,0 +1,40 @@ +package com.yxt.warehouse.apiadmin; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.warehouse.biz.operationrecord.OperationRecordDto; +import com.yxt.warehouse.biz.operationrecord.OperationRecordService; +import com.yxt.warehouse.biz.operationrecord.OperationRecordVo; +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/7/24 9:34 + */ +@Api(tags = "操作记录") +@RestController +@RequestMapping("/apiadmin/operationrecord") +public class OperationRecordRest { + @Autowired + OperationRecordService operationRecordService; + + + @PostMapping("save") + @ApiOperation("新增") + ResultBean saveOrUpdate(@RequestBody OperationRecordDto dto) { + return operationRecordService.save(dto); + } + + @GetMapping("/details") + @ApiOperation("详情") + ResultBean> details(@RequestParam("sid") String sid) { + return operationRecordService.details(sid); + } + +} diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAnsBillDetailsRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAnsBillDetailsRest.java index eb1e0cf..be1cc53 100644 --- a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAnsBillDetailsRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAnsBillDetailsRest.java @@ -3,15 +3,14 @@ package com.yxt.warehouse.apiadmin; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillDetailDto; -import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillDetailQuery; -import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillDetailService; -import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillDetailVo; +import com.yxt.warehouse.biz.warehouseansbilldetail.*; 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/6/6 15:04 @@ -29,6 +28,13 @@ public class WarehouseAnsBillDetailsRest { public ResultBean> listPage(@RequestBody PagerQuery pq){ return warehouseAnsBillDetailService.listPage(pq); } + @ApiOperation("根据sid查询详情") + @PostMapping("/selectByBillSid/{sid}") + public ResultBean> selectByBillSid(@PathVariable("sid") String sid){ + ResultBean rb= new ResultBean().fail(); + ListwarehouseAnsListDetailsVos= warehouseAnsBillDetailService.selectByBillSid(sid); + return rb.success().setData(warehouseAnsListDetailsVos); + } @ApiOperation("新增或修改") @PostMapping("/save") diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAnsBillRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAnsBillRest.java index 53e3d61..57e98e2 100644 --- a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAnsBillRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAnsBillRest.java @@ -1,14 +1,22 @@ package com.yxt.warehouse.apiadmin; +import com.yxt.common.base.utils.ExportExcelUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.warehouse.biz.warehouseansbill.*; +import com.yxt.warehouse.biz.warehouseinventoryrecord.WarehouseInventoryRecordsExcelVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.util.ArrayList; +import java.util.List; + /** * @description: * @author: dimengzhe @@ -21,6 +29,8 @@ public class WarehouseAnsBillRest { @Autowired private WarehouseAnsBillService wmsAnsBillService; + @Autowired + HttpServletResponse response; @PostMapping("saveOrUpdate") @@ -41,16 +51,42 @@ public class WarehouseAnsBillRest { ResultBean details(@RequestParam("sid") String sid) { return wmsAnsBillService.details(sid); } - @GetMapping("/getWarehouseAns") - @ApiOperation("获取入库单") - ResultBean getWarehouseAns(@RequestParam("sid") String sid) { - return wmsAnsBillService.getWarehouseAns(sid); - } @PostMapping("/saveBill") @ApiOperation("保存预期到通知单") - ResultBean saveBill(@RequestBody WarehouseAnsBillDto dto) { + public ResultBean saveBill(@RequestBody WarehouseAnsBillDto dto) { return wmsAnsBillService.saveBill(dto); } + @PostMapping("/exportExcel") + @ApiOperation(value = "导出") + public void exportExcel(@RequestBody WarehouseAnsBillQuery query) { + //得到所有要导出的数据 + List exportVoList=new ArrayList<>(); + if(query.getQueryType().equals("1")){ + exportVoList = wmsAnsBillService.listExcel(query).getData(); + }else if(query.getQueryType().equals("2")){ + exportVoList = wmsAnsBillService.listExcel1(query).getData(); + } + //定义导出的excel名字 + String excelName = "入库预约单"; + String fileNameURL = ""; + try { + fileNameURL = URLEncoder.encode(excelName, "UTF-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + ExportExcelUtils.export(fileNameURL, exportVoList, WarehouseAnsBillExcelVo.class, response); + + } + @PostMapping("/updateRack") + @ApiOperation("修改库区") + public ResultBean updateRack(@RequestBody WarehouseAnsBillDto dto) { + return wmsAnsBillService.updateRack(dto); + } + @PostMapping("/updateRemarks") + @ApiOperation("修改单据备注") + public ResultBean updateRemarks(@RequestBody WarehouseAnsBillDto dto) { + return wmsAnsBillService.updateRemarks(dto); + } } diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryRecordRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryRecordRest.java index 59802d3..582023d 100644 --- a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryRecordRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryRecordRest.java @@ -167,6 +167,5 @@ public class WarehouseInventoryRecordRest { e.printStackTrace(); } ExportExcelUtils.export(fileNameURL, exportVoList, WarehouseInventoryRecordsExcelVo.class, response); - } } diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseRackRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseRackRest.java index 74ebdc2..96a87ba 100644 --- a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseRackRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseRackRest.java @@ -29,10 +29,10 @@ public class WarehouseRackRest { public ResultBean> listPage(@RequestBody PagerQuery pq) { return wmsWarehouseRackService.listPage(pq); } - @ApiOperation("查询所有的库区") - @PostMapping("/getAllType") - public ResultBean getAllType(@RequestBody OrgPathQuery query) { - return wmsWarehouseRackService.getAllType(query); + @ApiOperation("查询所有的库位") + @PostMapping("/listAll") + public ResultBean listAll(@RequestBody OrgPathQuery query) { + return wmsWarehouseRackService.listAll(query); } @ApiOperation("保存修改") diff --git a/src/main/java/com/yxt/warehouse/biz/operationrecord/OperationRecord.java b/src/main/java/com/yxt/warehouse/biz/operationrecord/OperationRecord.java new file mode 100644 index 0000000..5dab18a --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/operationrecord/OperationRecord.java @@ -0,0 +1,22 @@ +package com.yxt.warehouse.biz.operationrecord; + +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/7/24 9:34 + */ +@Data +public class OperationRecord extends BaseEntity { + @ApiModelProperty("单据sid") + private String billSid; + @ApiModelProperty("修改用户sid") + private String userSid; + @ApiModelProperty("修改用户") + private String userName; + @ApiModelProperty("内容") + private String content; + +} diff --git a/src/main/java/com/yxt/warehouse/biz/operationrecord/OperationRecordDto.java b/src/main/java/com/yxt/warehouse/biz/operationrecord/OperationRecordDto.java new file mode 100644 index 0000000..206dbcb --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/operationrecord/OperationRecordDto.java @@ -0,0 +1,29 @@ +package com.yxt.warehouse.biz.operationrecord; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/7/24 9:34 + */ +@Data +public class OperationRecordDto { + + private String sid; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("创建时间") + private Date createTime; + @ApiModelProperty("单据sid") + private String billSid; + @ApiModelProperty("修改用户sid") + private String userSid; + @ApiModelProperty("修改用户") + private String userName; + @ApiModelProperty("内容") + private String content; +} diff --git a/src/main/java/com/yxt/warehouse/biz/operationrecord/OperationRecordMapper.java b/src/main/java/com/yxt/warehouse/biz/operationrecord/OperationRecordMapper.java new file mode 100644 index 0000000..bf28ac7 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/operationrecord/OperationRecordMapper.java @@ -0,0 +1,23 @@ +package com.yxt.warehouse.biz.operationrecord; + +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 com.yxt.warehouse.biz.warehouseansbill.WarehouseAnsDetailsVo; +import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillDetail; +import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillDetailVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/7/24 9:34 + */ +@Mapper +public interface OperationRecordMapper extends BaseMapper { + + List details(String sid); +} diff --git a/src/main/java/com/yxt/warehouse/biz/operationrecord/OperationRecordMapper.xml b/src/main/java/com/yxt/warehouse/biz/operationrecord/OperationRecordMapper.xml new file mode 100644 index 0000000..8a65049 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/operationrecord/OperationRecordMapper.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/warehouse/biz/operationrecord/OperationRecordQuery.java b/src/main/java/com/yxt/warehouse/biz/operationrecord/OperationRecordQuery.java new file mode 100644 index 0000000..4356ca0 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/operationrecord/OperationRecordQuery.java @@ -0,0 +1,42 @@ +package com.yxt.warehouse.biz.operationrecord; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/7/24 9:34 + */ +@Data +public class OperationRecordQuery implements Query { + @ApiModelProperty("业务类型") + private String busTypeKey; + @ApiModelProperty("外部单号（业务单据编号）") + private String sourceBillNo; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("商品sid") + private String goodsSkuSid; + @ApiModelProperty("申请开始时间") + private String applicationTimeStart; + @ApiModelProperty("申请结束时间") + private String applicationTimeEnd; + @ApiModelProperty("货物状态（在途、部分收货、已收货、已取消）") + private String billState; + @ApiModelProperty("供应商") + private String supplierName; + @ApiModelProperty("运单号") + private String waybillNumber; + @ApiModelProperty("库区sid") + private String warehouseRackSid; + + private String orgLevelKey;//权限等级 + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") + private String orgPath; + @ApiModelProperty("用户sid") + private String userSid; + private int index; +} diff --git a/src/main/java/com/yxt/warehouse/biz/operationrecord/OperationRecordService.java b/src/main/java/com/yxt/warehouse/biz/operationrecord/OperationRecordService.java new file mode 100644 index 0000000..1468693 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/operationrecord/OperationRecordService.java @@ -0,0 +1,56 @@ +package com.yxt.warehouse.biz.operationrecord; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateTime; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.warehouse.biz.warehouseansbill.WarehouseAnsDetailsVo; +import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillDetailDto; +import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillDetailService; +import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsListDetailsVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Collections; +import java.util.Date; +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/7/24 9:34 + */ +@Service +public class OperationRecordService extends MybatisBaseService { + + + + public ResultBean save(OperationRecordDto dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + if (StringUtils.isBlank(sid)) { + OperationRecord WarehouseAnsBill = new OperationRecord(); + BeanUtil.copyProperties(dto, WarehouseAnsBill, "sid"); + sid = WarehouseAnsBill.getSid(); + WarehouseAnsBill.setCreateTime(new DateTime()); + WarehouseAnsBill.setCreateBySid(dto.getUserSid()); + baseMapper.insert(WarehouseAnsBill); + + } + return rb.success().setData(sid); + } + + + + public ResultBean> details(String sid) { + ResultBean> rb = ResultBean.fireFail(); + List operationRecordVoList = baseMapper.details(sid); + return rb.success().setData(operationRecordVoList); + } + +} diff --git a/src/main/java/com/yxt/warehouse/biz/operationrecord/OperationRecordVo.java b/src/main/java/com/yxt/warehouse/biz/operationrecord/OperationRecordVo.java new file mode 100644 index 0000000..f406d4a --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/operationrecord/OperationRecordVo.java @@ -0,0 +1,25 @@ +package com.yxt.warehouse.biz.operationrecord; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/7/24 9:34 + */ +@Data +public class OperationRecordVo { + + + @ApiModelProperty("单据sid") + private String billSid; + @ApiModelProperty("修改用户sid") + private String userSid; + @ApiModelProperty("修改用户") + private String userName; + @ApiModelProperty("内容") + private String content; +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillDto.java b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillDto.java index 21401d5..f6c7852 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillDto.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillDto.java @@ -63,5 +63,6 @@ public class WarehouseAnsBillDto { @ApiModelProperty("创建组织sid") private String createOrgSid; private String userSid; + private String remarks; private List StorageAnsBillDetailList = new ArrayList<>(); } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillExcelVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillExcelVo.java new file mode 100644 index 0000000..93fb276 --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillExcelVo.java @@ -0,0 +1,12 @@ +package com.yxt.warehouse.biz.warehouseansbill; + +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/7/24 15:24 + */ +@Data +public class WarehouseAnsBillExcelVo { + +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillMapper.java b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillMapper.java index 7d1260c..bc0e712 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillMapper.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillMapper.java @@ -9,6 +9,8 @@ import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillDetailVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * @description: * @author: dimengzhe @@ -19,6 +21,10 @@ public interface WarehouseAnsBillMapper extends BaseMapper { IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); IPage listPages(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + List listExcel(@Param(Constants.WRAPPER) QueryWrapper qw); + List listExcel1(@Param(Constants.WRAPPER) QueryWrapper qw); + List listExcel2(@Param("sids")String[]sids); + List listExcel3(@Param("sids")String[]sids); WarehouseAnsDetailsVo details(String sid); } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillMapper.xml index 2c991b5..7cd0ddd 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillMapper.xml @@ -18,7 +18,40 @@ order by wab.id desc - + + + +