open_platform/ss-common-storage
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

29

Browse Source
This commit is contained in:
wangpengfei
2024-07-29 08:58:45 +08:00
parent 8f6644316a
commit 9a93c49fd1
22 changed files with 471 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/main/java/com/yxt/warehouse/apiadmin/OperationRecordRest.java Normal file
View File

@@ -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<String> saveOrUpdate(@RequestBody OperationRecordDto dto) {
return operationRecordService.save(dto);
}
@GetMapping("/details")
@ApiOperation("详情")
ResultBean<List<OperationRecordVo>> details(@RequestParam("sid") String sid) {
return operationRecordService.details(sid);
}
}

14
src/main/java/com/yxt/warehouse/apiadmin/WarehouseAnsBillDetailsRest.java
View File

@@ -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<PagerVo<WarehouseAnsBillDetailVo>> listPage(@RequestBody PagerQuery<WarehouseAnsBillDetailQuery> pq){
return warehouseAnsBillDetailService.listPage(pq);
}
@ApiOperation("根据sid查询详情")
@PostMapping("/selectByBillSid/{sid}")
public ResultBean<PagerVo<WarehouseAnsBillDetailVo>> selectByBillSid(@PathVariable("sid") String sid){
ResultBean rb= new ResultBean().fail();
List<WarehouseAnsListDetailsVo>warehouseAnsListDetailsVos= warehouseAnsBillDetailService.selectByBillSid(sid);
return rb.success().setData(warehouseAnsListDetailsVos);
}
@ApiOperation("新增或修改")
@PostMapping("/save")

48
src/main/java/com/yxt/warehouse/apiadmin/WarehouseAnsBillRest.java
View File

@@ -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<WarehouseAnsDetailsVo> details(@RequestParam("sid") String sid) {
return wmsAnsBillService.details(sid);
}
@GetMapping("/getWarehouseAns")
@ApiOperation("获取入库单")
ResultBean<WarehouseAnsDetailsVo> getWarehouseAns(@RequestParam("sid") String sid) {
return wmsAnsBillService.getWarehouseAns(sid);
}
@PostMapping("/saveBill")
@ApiOperation("保存预期到通知单")
ResultBean<String> saveBill(@RequestBody WarehouseAnsBillDto dto) {
public ResultBean<String> saveBill(@RequestBody WarehouseAnsBillDto dto) {
return wmsAnsBillService.saveBill(dto);
}
@PostMapping("/exportExcel")
@ApiOperation(value = "导出")
public void exportExcel(@RequestBody WarehouseAnsBillQuery query) {
//得到所有要导出的数据
List<WarehouseAnsBillExcelVo> 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);
}
}

1
src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryRecordRest.java
View File

@@ -167,6 +167,5 @@ public class WarehouseInventoryRecordRest {
e.printStackTrace();
}
ExportExcelUtils.export(fileNameURL, exportVoList, WarehouseInventoryRecordsExcelVo.class, response);
}
}

8
src/main/java/com/yxt/warehouse/apiadmin/WarehouseRackRest.java
View File

@@ -29,10 +29,10 @@ public class WarehouseRackRest {
public ResultBean<PagerVo<WarehouseRackVo>> listPage(@RequestBody PagerQuery<WarehouseRackQuery> pq) {
return wmsWarehouseRackService.listPage(pq);
}
@ApiOperation("查询所有的库区")
@PostMapping("/getAllType")
public ResultBean<WarehouseRackVo> getAllType(@RequestBody OrgPathQuery query) {
return wmsWarehouseRackService.getAllType(query);
@ApiOperation("查询所有的库位")
@PostMapping("/listAll")
public ResultBean<WarehouseRackVo> listAll(@RequestBody OrgPathQuery query) {
return wmsWarehouseRackService.listAll(query);
}
@ApiOperation("保存修改")

22
src/main/java/com/yxt/warehouse/biz/operationrecord/OperationRecord.java Normal file
View File

@@ -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;
}

29
src/main/java/com/yxt/warehouse/biz/operationrecord/OperationRecordDto.java Normal file
View File

@@ -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;
}

23
src/main/java/com/yxt/warehouse/biz/operationrecord/OperationRecordMapper.java Normal file
View File

@@ -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<OperationRecord> {
List<OperationRecordVo> details(String sid);
}

10
src/main/java/com/yxt/warehouse/biz/operationrecord/OperationRecordMapper.xml Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.warehouse.biz.operationrecord.OperationRecordMapper">
<select id="details" resultType="com.yxt.warehouse.biz.operationrecord.OperationRecordVo">
select a.*
from operation_record a
where a.billSid = #{sid}
</select>
</mapper>

42
src/main/java/com/yxt/warehouse/biz/operationrecord/OperationRecordQuery.java Normal file
View File

@@ -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;
}

56
src/main/java/com/yxt/warehouse/biz/operationrecord/OperationRecordService.java Normal file
View File

@@ -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<OperationRecordMapper, OperationRecord> {
public ResultBean<String> save(OperationRecordDto dto) {
ResultBean<String> 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<List<OperationRecordVo>> details(String sid) {
ResultBean<List<OperationRecordVo>> rb = ResultBean.fireFail();
List<OperationRecordVo> operationRecordVoList = baseMapper.details(sid);
return rb.success().setData(operationRecordVoList);
}
}

25
src/main/java/com/yxt/warehouse/biz/operationrecord/OperationRecordVo.java Normal file
View File

@@ -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;
}

1
src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillDto.java
View File

@@ -63,5 +63,6 @@ public class WarehouseAnsBillDto {
@ApiModelProperty("创建组织sid")
private String createOrgSid;
private String userSid;
private String remarks;
private List<WarehouseAnsBillDetailDto> StorageAnsBillDetailList = new ArrayList<>();
}

12
src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillExcelVo.java Normal file
View File

@@ -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 {
}

6
src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillMapper.java
View File

@@ -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<WarehouseAnsBill> {
IPage<WarehouseAnsBillDetailVo> listPage(IPage<WarehouseAnsBillDetail> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseAnsBillDetail> qw);
IPage<WarehouseAnsBillVo> listPages(IPage<WarehouseAnsBill> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseAnsBill> qw);
List<WarehouseAnsBillExcelVo> listExcel(@Param(Constants.WRAPPER) QueryWrapper<WarehouseAnsBill> qw);
List<WarehouseAnsBillExcelVo> listExcel1(@Param(Constants.WRAPPER) QueryWrapper<WarehouseAnsBill> qw);
List<WarehouseAnsBillExcelVo> listExcel2(@Param("sids")String[]sids);
List<WarehouseAnsBillExcelVo> listExcel3(@Param("sids")String[]sids);
WarehouseAnsDetailsVo details(String sid);
}

35
src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillMapper.xml
View File

@@ -18,7 +18,40 @@
</where>
order by wab.id desc
</select>
<select id="listExcel" resultType="com.yxt.warehouse.biz.warehouseansbill.WarehouseAnsBillVo">
select wab.*
from warehouse_ans_bill wab
LEFT JOIN ss_user.sys_organization as s ON wab.useOrgSid = s.sid
<where>
${ew.sqlSegment}
</where>
</select>
<select id="listExcel1" resultType="com.yxt.warehouse.biz.warehouseansbill.WarehouseAnsBillVo">
select wab.*
from warehouse_ans_bill wab
LEFT JOIN ss_user.sys_organization as s ON wab.useOrgSid = s.sid
left join warehouse_ans_bill_detail as b on wab.sid =b.billSid
<where>
${ew.sqlSegment}
</where>
</select>
<select id="listExcel2" resultType="com.yxt.warehouse.biz.warehouseansbill.WarehouseAnsBillVo">
select wab.*
from warehouse_ans_bill wab
left join warehouse_ans_bill_detail as b on wab.sid =b.billSid
where wab.sid in
<foreach collection="sids" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</select>
<select id="listExcel3" resultType="com.yxt.warehouse.biz.warehouseansbill.WarehouseAnsBillVo">
select wab.*
from warehouse_ans_bill wab
where wab.sid in
<foreach collection="sids" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</select>
<select id="details" resultType="com.yxt.warehouse.biz.warehouseansbill.WarehouseAnsDetailsVo">
select wab.*
from warehouse_ans_bill wab

4
src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillQuery.java
View File

@@ -40,4 +40,8 @@ public class WarehouseAnsBillQuery implements Query {
@ApiModelProperty("用户sid")
private String userSid;
private int index;
private String queryType;//1条件 2勾选的
private String contentType;//1包含明细 2不包含明细
private String sids;//勾选的sid /拼接
}

104
src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillService.java
View File

@@ -12,9 +12,12 @@ import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.warehouse.biz.warehouseansbilldetail.*;
import com.yxt.warehouse.biz.warehouseinfo.WarehouseInfoVo;
import com.yxt.warehouse.biz.warehouserack.WarehouseRack;
import com.yxt.warehouse.biz.warehouserack.WarehouseRackService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.List;
@@ -29,6 +32,8 @@ public class WarehouseAnsBillService extends MybatisBaseService<WarehouseAnsBill
@Autowired
private WarehouseAnsBillDetailService WarehouseAnsBillDetailService;
@Autowired
WarehouseRackService warehouseRackService;
public ResultBean<String> saveOrUpdateBill(WarehouseAnsBillDto dto) {
ResultBean<String> rb = ResultBean.fireFail();
@@ -147,11 +152,7 @@ public class WarehouseAnsBillService extends MybatisBaseService<WarehouseAnsBill
}
return rb.success().setData(WarehouseAnsDetailsVo);
}
public ResultBean<WarehouseAnsDetailsVo> getWarehouseAns(String sid) {
ResultBean<WarehouseAnsDetailsVo> rb = ResultBean.fireFail();
WarehouseAnsDetailsVo WarehouseAnsDetailsVo = baseMapper.details(sid);
return rb.success().setData(WarehouseAnsDetailsVo);
}
public ResultBean<String> saveBill(WarehouseAnsBillDto dto) {
ResultBean<String> rb = ResultBean.fireFail();
String sid = dto.getSid();
@@ -171,4 +172,97 @@ public class WarehouseAnsBillService extends MybatisBaseService<WarehouseAnsBill
baseMapper.insert(WarehouseAnsBill);
return rb;
}
public ResultBean<List<WarehouseAnsBillExcelVo>> listExcel(WarehouseAnsBillQuery query) {
ResultBean rb = ResultBean.fireFail();
QueryWrapper<WarehouseAnsBill> qw = new QueryWrapper<>();
//ToDo:添加查询条件
if (query != null) {
if (StringUtils.isNotBlank(query.getOrgLevelKey())) {
//数据权限ID(1全部、2本部门及子部门、3本部门、4个人)
String orgLevelKey=query.getOrgLevelKey();
String orgSidPath=query.getOrgPath();
int index=query.getIndex();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, index);
qw.like("s.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, index);
qw.like("s.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, index);
qw.apply("s.orgSidPath like('"+orgSidPath+"')");
} else if ("4".equals(orgLevelKey)) {
qw.eq("wab.createBySid", query.getUserSid());
} else {
PagerVo<WarehouseAnsBillVo> p = new PagerVo<>();
return rb.success().setData(p);
}
} else {
PagerVo<WarehouseAnsBillVo> p = new PagerVo<>();
return rb.success().setData(p);
}
//单据编号
if (StringUtils.isNotBlank(query.getBillNo())) {
qw.like("wab.billNo", query.getBillNo());
}
//申请日期开始时间-申请日期结束时间
qw.apply(StringUtils.isNotBlank(query.getApplicationTimeStart()), "date_format (wab.createTime,'%Y-%m-%d') >= date_format('" + query.getApplicationTimeStart() + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(query.getApplicationTimeEnd()), "date_format (wab.createTime,'%Y-%m-%d') <= date_format('" + query.getApplicationTimeEnd() + "','%Y-%m-%d')"
);
//业务类型
if (StringUtils.isNotBlank(query.getBusTypeKey())) {
qw.eq("wab.busTypeKey", query.getBusTypeKey());
}
//供应商
if (StringUtils.isNotBlank(query.getSupplierName())) {
qw.like("wab.supplierName", query.getSupplierName());
}
//单据状态
if (StringUtils.isNotBlank(query.getBillState())) {
qw.like("wab.billState", query.getBillState());
}
//外部编号
if (StringUtils.isNotBlank(query.getSourceBillNo())) {
qw.like("wab.sourceBillNo", query.getSourceBillNo());
}
}
List<WarehouseAnsBillExcelVo> pagging=new ArrayList<>();
if (query.getContentType().equals("1")){
pagging = baseMapper.listExcel1(qw);
}else {
pagging = baseMapper.listExcel(qw);
}
return rb.success().setData(pagging);
}
public ResultBean<List<WarehouseAnsBillExcelVo>> listExcel1(WarehouseAnsBillQuery query) {
ResultBean rb = ResultBean.fireFail();
QueryWrapper<WarehouseAnsBill> qw = new QueryWrapper<>();
String [] sids=query.getSids().split("/");
List<WarehouseAnsBillExcelVo> pagging=new ArrayList<>();
if (query.getContentType().equals("1")){
pagging = baseMapper.listExcel2(sids);
}else {
pagging = baseMapper.listExcel3(sids);
}
return rb.success().setData(pagging);
}
public ResultBean<List<WarehouseAnsBillExcelVo>> updateRack(WarehouseAnsBillDto dto) {
ResultBean rb = ResultBean.fireFail();
WarehouseAnsBill bill=baseMapper.selectOne(new QueryWrapper<WarehouseAnsBill>().eq("sid",dto.getSid()));
bill.setWarehouseRackSid(dto.getWarehouseRackSid());
WarehouseRack warehouseRack=warehouseRackService.getOne(new QueryWrapper<WarehouseRack>().eq("sid",bill.getWarehouseRackSid()));
bill.setWarehouseRackName(warehouseRack.getRackName());
baseMapper.updateById(bill);
return rb.success().setData("成功");
}
public ResultBean<List<WarehouseAnsBillExcelVo>> updateRemarks(WarehouseAnsBillDto dto) {
ResultBean rb = ResultBean.fireFail();
WarehouseAnsBill bill=baseMapper.selectOne(new QueryWrapper<WarehouseAnsBill>().eq("sid",dto.getSid()));
bill.setWarehouseRackSid(dto.getRemarks());
baseMapper.updateById(bill);
return rb.success().setData("成功");
}
}

60
src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsSupplierVo.java
View File

@@ -1,60 +0,0 @@
package com.yxt.warehouse.biz.warehouseansbill;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
* @author wangpengfei
* @date 2024/7/23 16:26
*/
@Data
public class WarehouseAnsSupplierVo {
@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 busTypeValue;
@ApiModelProperty("交接状态")
private String handoverStatus;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("交接时间")
private Date handoverTime;
@ApiModelProperty("货物状态（在途、部分收货、已收货、已取消）")
private Integer billState;
@ApiModelProperty("仓库sid")
private Integer 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;
}

2
src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailVo.java
View File

@@ -31,4 +31,6 @@ public class WarehouseAnsBillDetailVo {
private Integer waitInCount;
@ApiModelProperty("实际入库数量-根据收货单计算")
private Integer actualInCount;
private String barCode;
private String specificationCode;
}

5
src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeService.java
View File

@@ -11,6 +11,7 @@ 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.warehouseinfo.WarehouseInfoVo;
import com.yxt.warehouse.biz.warehouserack.WarehouseRack;
import com.yxt.warehouse.utils.OrgPathQuery;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestBody;
@@ -81,6 +82,10 @@ public class WarehouseAreaTypeService extends MybatisBaseService<WarehouseAreaTy
wmsWarehouseArea.setModifyTime(new Date());
baseMapper.updateById(wmsWarehouseArea);
} else {
WarehouseAreaType rack=baseMapper.selectOne(new QueryWrapper<WarehouseAreaType>().eq("warehouseAreaTypeName",dto.getWarehouseAreaTypeName()));
if(null!=rack){
return rb.setMsg("编码重复");
}
WarehouseAreaType wmsWarehouseArea = new WarehouseAreaType();
sid = wmsWarehouseArea.getSid();
BeanUtil.copyProperties(dto, wmsWarehouseArea, "id", "sid");

6
src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackService.java
View File

@@ -74,7 +74,7 @@ public class WarehouseRackService extends MybatisBaseService<WarehouseRackMapper
PagerVo<WarehouseRackVo> p = PagerUtil.pageToVo(pagging, null);
return rb.success().setData(p);
}
public ResultBean<WarehouseRackVo> getAllType(OrgPathQuery query) {
public ResultBean<WarehouseRackVo> listAll(OrgPathQuery query) {
ResultBean rb = ResultBean.fireFail();
List<WarehouseRackVo> pagging = baseMapper.listAll(query.getOrgPath());
return rb.success().setData(pagging);
@@ -90,6 +90,10 @@ public class WarehouseRackService extends MybatisBaseService<WarehouseRackMapper
wmsWarehouseRack.setModifyTime(new Date());
baseMapper.updateById(wmsWarehouseRack);
} else {
WarehouseRack rack=baseMapper.selectOne(new QueryWrapper<WarehouseRack>().eq("rackCode",dto.getRackCode()));
if(null!=rack){
return rb.setMsg("编码重复");
}
WarehouseRack wmsWarehouseRack = new WarehouseRack();
sid = wmsWarehouseRack.getSid();
BeanUtil.copyProperties(dto, wmsWarehouseRack, "id", "sid");