yxt_product
/
wms-biz
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1

master
wangpengfei 10 months ago
parent
a62aa9e8c2
commit
84434fa590
36 changed files with 1695 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 59
      wms/src/main/java/com/yxt/wms/apiadmin/aggregation/PurchaseInventoryBillRest.java
  2. 79
      wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SystemLogRest.java
  3. 10
      wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseAnsBillRest.java
  4. 60
      wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBill.java
  5. 68
      wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillDto2.java
  6. 66
      wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillInitVo.java
  7. 20
      wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillMapper.java
  8. 18
      wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillMapper.xml
  9. 61
      wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillPageVo.java
  10. 42
      wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillQuery.java
  11. 64
      wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillService.java
  12. 65
      wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillVo.java
  13. 62
      wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetail.java
  14. 60
      wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailDto.java
  15. 69
      wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailDto2.java
  16. 30
      wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailMapper.java
  17. 40
      wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailMapper.xml
  18. 13
      wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailQuery.java
  19. 135
      wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailService.java
  20. 62
      wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailVo.java
  21. 44
      wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLog.java
  22. 46
      wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLogDto.java
  23. 38
      wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLogMapper.java
  24. 13
      wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLogMapper.xml
  25. 44
      wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLogQuery.java
  26. 64
      wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLogService.java
  27. 44
      wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLogVo.java
  28. 65
      wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAndBillDetailVo.java
  29. 2
      wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillQuery.java
  30. 8
      wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillService.java
  31. 68
      wms/src/main/java/com/yxt/wms/feign/portal/systemlog/SystemLogFeign.java
  32. 67
      wms/src/main/java/com/yxt/wms/feign/portal/systemlog/SystemLogFeignFallback.java
  33. 48
      wms/src/main/java/com/yxt/wms/feign/warehouse/purchaseinventorybill/PurchaseInventoryBillFeign.java
  34. 59
      wms/src/main/java/com/yxt/wms/feign/warehouse/purchaseinventorybill/PurchaseInventoryBillFeignFallback.java
  35. 9
      wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeign.java
  36. 10
      wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeignFallback.java

59
wms/src/main/java/com/yxt/wms/apiadmin/aggregation/PurchaseInventoryBillRest.java
View File

@ -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<PagerVo<PurchaseInventoryBillPageVo>> listPage(@RequestBody PagerQuery<PurchaseInventoryBillQuery> pq) {
return purchaseInventoryBillService.listPage(pq);
}
@ApiOperation("新增修改保存")
@PostMapping("/saveOrUpdate")
ResultBean<String> saveOrUpdate(@RequestBody PurchaseInventoryBillDto2 dto) {
return purchaseInventoryBillService.saveOrUpdateBill2(dto);
}
@ApiOperation("采购入库单据编辑初始化/详情")
@GetMapping("/selectByBillSid")
ResultBean<PurchaseInventoryBillInitVo> selectByBillSid(@RequestParam("sid") String sid) {
return purchaseInventoryBillService.selectByBillSid(sid);
}
@ApiOperation("确认")
@PostMapping("/confirm")
ResultBean<String> confirm(@RequestBody PurchaseInventoryBillDto2 dto) {
return purchaseInventoryBillService.confirm(dto);
}
@ApiOperation("删除/批量删除")
@DeleteMapping("/delBySids")
ResultBean delBySids(@RequestBody String[] sids) {
return purchaseInventoryBillService.delAllBySids(sids);
}
}

79
wms/src/main/java/com/yxt/wms/apiadmin/aggregation/SystemLogRest.java
View File

@ -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(门户建设) <br/>
* File: SystemLogFeignFallback.java <br/>
* Class: com.yxt.anrui.portal.biz.systemlog.SystemLogRest <br/>
* Description: 系统日志表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:30 <br/>
*
* @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<PagerVo<SystemLogVo>> listPage(@RequestBody PagerQuery<SystemLogQuery> pq){
return systemLogService.listPageVo(pq);
}
@Override
public ResultBean<List<SystemLogVo>> listAll(@RequestBody SystemLogQuery query){
return systemLogService.listAllVo(query);
}
@Override
public ResultBean<List<SystemLogVo>> 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<SystemLogVo> fetch(String id){
return systemLogService.fetchByIdVo(id);
}
}

10
wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseAnsBillRest.java
View File

@ -34,13 +34,11 @@ public class WarehouseAnsBillRest {
return warehouseAnsBillService.saveOrUpdateBill(dto);
}
/* @PostMapping("pageList")
@PostMapping("pageList")
@ApiOperation("收货单据选择")
ResultBean<PagerVo<WmsAnsBillDetailVo>> pageList(@RequestBody PagerQuery<WmsAnsBillDetailQuery> pagerQuery) {
ResultBean<PagerVo<WmsAnsBillDetailVo>> rb = ResultBean.fireFail();
PagerVo<WmsAnsBillDetailVo> pv = wmsAnsBillService.listPage(pagerQuery);
return rb.success().setData(pv);
}*/
ResultBean<PagerVo<WarehouseAndBillDetailVo>> pageList(@RequestBody PagerQuery<WarehouseAnsBillQuery> pagerQuery) {
return warehouseAnsBillService.listPageAns(pagerQuery);
}
@PostMapping("listPage")
@ApiOperation("分页列表")

60
wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBill.java
View File

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

68
wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillDto2.java
View File

@ -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<PurchaseInventoryBillDetailDto2> list = new ArrayList<>();
// @ApiModelProperty("批次列表")
// private List<WarehouseReceiptBillDetailBatchDto2> pcList = new ArrayList<>();
}

66
wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillInitVo.java
View File

@ -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<PurchaseInventoryBillDetailVo> list = new ArrayList<>();
}

20
wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillMapper.java
View File

@ -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<PurchaseInventoryBill> {
IPage<PurchaseInventoryBillPageVo> listPage(IPage<PurchaseInventoryBill> page, @Param(Constants.WRAPPER) QueryWrapper<PurchaseInventoryBill> qw);
PurchaseInventoryBillInitVo getDetailsInit(String sid);
}

18
wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillMapper.xml
View File

@ -0,0 +1,18 @@
<?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.wms.biz.func.purchaseinventorybill.PurchaseInventoryBillMapper">
<select id="listPage" resultType="com.yxt.wms.biz.func.purchaseinventorybill.PurchaseInventoryBillPageVo">
select wrb.*
from purchase_inventory_bill wrb
<where>
${ew.sqlSegment}
</where>
order by wrb.id desc
</select>
<select id="getDetailsInit" resultType="com.yxt.wms.biz.func.purchaseinventorybill.PurchaseInventoryBillInitVo">
select wrb.*
from purchase_inventory_bill wrb
where wrb.sid = #{sid}
</select>
</mapper>

61
wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillPageVo.java
View File

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

42
wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillQuery.java
View File

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

64
wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillService.java
View File

@ -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<PurchaseInventoryBillMapper, PurchaseInventoryBill> {
@Autowired
private PurchaseInventoryBillFeign purchaseInventoryBillFeign;
public ResultBean<PagerVo<PurchaseInventoryBillPageVo>> listPage(PagerQuery<PurchaseInventoryBillQuery> pq) {
return purchaseInventoryBillFeign.listPage(pq);
}
public ResultBean<String> saveOrUpdateBill2(PurchaseInventoryBillDto2 dto) {
return purchaseInventoryBillFeign.saveOrUpdate(dto);
}
public ResultBean<PurchaseInventoryBillInitVo> selectByBillSid(String sid) {
return purchaseInventoryBillFeign.selectByBillSid(sid);
}
public ResultBean<String> confirm(PurchaseInventoryBillDto2 dto) {
return purchaseInventoryBillFeign.confirm(dto);
}
public ResultBean delAllBySids(String[] sids) {
return purchaseInventoryBillFeign.delBySids(sids);
}
}

65
wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillVo.java
View File

@ -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<PurchaseInventoryBillDetailVo> list = new ArrayList<>();
}

62
wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetail.java
View File

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

60
wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailDto.java
View File

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

69
wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailDto2.java
View File

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

30
wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailMapper.java
View File

@ -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<PurchaseInventoryBillDetail> {
int deleteByBillSid(String sid);
List<PurchaseInventoryBillDetailVo> getDetailsInit(String sid);
List<PurchaseInventoryBillDetail> selectByBillSid(@Param("sid") String sid, @Param("sidList") List<String> sidList);
IPage<PurchaseInventoryBillDetailVo> listPage(IPage<PurchaseInventoryBillDetail> page, @Param(Constants.WRAPPER) QueryWrapper<PurchaseInventoryBillDetail> qw);
PurchaseInventoryBillDetailVo initialization (@Param("sid") String sid);
@Delete("delete from warehouse_reportlose where sid = #{sid}")
void delByMainSid(String billSid);
}

40
wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailMapper.xml
View File

@ -0,0 +1,40 @@
<?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.wms.biz.func.purchaseinventorybilldetail.PurchaseInventoryBillDetailMapper">
<delete id="deleteByBillSid">
delete
from pruchase_inventory_bill_detail
where billSid = #{sid}
</delete>
<select id="getDetailsInit" resultType="com.yxt.wms.biz.func.purchaseinventorybilldetail.PurchaseInventoryBillDetailVo">
select wrbd.*
from purchase_inventory_bill_detail wrbd
where sourceBillSid = #{sid}
</select>
<select id="selectByBillSid" resultType="com.yxt.wms.biz.func.purchaseinventorybilldetail.PurchaseInventoryBillDetail">
select *
from pruchase_inventory_bill_detail where billSid = #{sid}
<if test="sidList != null and sidList.size() != 0">
and sid not in
<foreach collection="sidList" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
</select>
<select id="listPage" resultType="com.yxt.wms.biz.func.purchaseinventorybilldetail.PurchaseInventoryBillDetailVo">
select
a.*
from pruchase_inventory_bill_detail a
<where>
${ew.sqlSegment}
</where>
</select>
<select id="initialization" resultType="com.yxt.wms.biz.func.purchaseinventorybilldetail.PurchaseInventoryBillDetailVo">
select
a.*
from pruchase_inventory_bill_detail a
where a.sid =#{sid}
</select>
</mapper>

13
wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailQuery.java
View File

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

135
wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailService.java
View File

@ -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<PurchaseInventoryBillDetailMapper, PurchaseInventoryBillDetail> {
public List<PurchaseInventoryBillDetailVo> getDetailsInit(String sid) {
return baseMapper.getDetailsInit(sid);
}
public List<PurchaseInventoryBillDetail> selectByBillSid(String sid, List<String> sidList) {
return baseMapper.selectByBillSid(sid, sidList);
}
public ResultBean<PagerVo<PurchaseInventoryBillDetailVo>> listPage(PagerQuery<PurchaseInventoryBillDetailQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PurchaseInventoryBillDetailQuery query = pq.getParams();
QueryWrapper<PurchaseInventoryBillDetail> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getName())) {
qw.like("rackName", query.getName());
}
IPage<PurchaseInventoryBillDetail> page = PagerUtil.queryToPage(pq);
IPage<PurchaseInventoryBillDetailVo> pagging = baseMapper.listPage(page, qw);
PagerVo<PurchaseInventoryBillDetailVo> p = PagerUtil.pageToVo(pagging, null);
List<PurchaseInventoryBillDetailVo> records = pagging.getRecords();
return rb.success().setData(p);
}
public ResultBean<String> 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<PurchaseInventoryBillDetailVo> 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;
}
}

62
wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybilldetail/PurchaseInventoryBillDetailVo.java
View File

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

44
wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLog.java
View File

@ -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(门户建设) <br/>
* File: SystemLog.java <br/>
* Class: com.yxt.anrui.portal.api.systemlog.SystemLog <br/>
* Description: 系统日志表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:30 <br/>
*
* @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;
}

46
wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLogDto.java
View File

@ -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(门户建设) <br/>
* File: SystemLogDto.java <br/>
* Class: com.yxt.anrui.portal.api.systemlog.SystemLogDto <br/>
* Description: 系统日志表 数据传输对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:30 <br/>
*
* @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;
}

38
wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLogMapper.java
View File

@ -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(门户建设) <br/>
* File: SystemLogMapper.java <br/>
* Class: com.yxt.anrui.portal.biz.systemlog.SystemLogMapper <br/>
* Description: 系统日志表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Mapper
public interface SystemLogMapper extends BaseMapper<SystemLog> {
//@Update("update system_log set name=#{msg} where id=#{id}")
//IPage<SystemLogVo> voPage(IPage<SystemLog> page, @Param(Constants.WRAPPER) QueryWrapper<SystemLog> qw);
IPage<SystemLogVo> selectPageVo(IPage<SystemLog> page, @Param(Constants.WRAPPER) Wrapper<SystemLog> qw);
List<SystemLogVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<SystemLog> qw);
@Select("select * from system_log")
List<SystemLogVo> selectListVo();
}

13
wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLogMapper.xml
View File

@ -0,0 +1,13 @@
<?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.wms.biz.func.systemlog.SystemLogMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.wms.biz.func.systemlog.SystemLogVo">
SELECT * FROM system_log <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.wms.biz.func.systemlog.SystemLogVo">
SELECT * FROM system_log <where> ${ew.sqlSegment} </where>
</select>
</mapper>

44
wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLogQuery.java
View File

@ -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(门户建设) <br/>
* File: SystemLogQuery.java <br/>
* Class: com.yxt.anrui.portal.api.systemlog.SystemLogQuery <br/>
* Description: 系统日志表 查询条件. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:30 <br/>
*
* @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;
}

64
wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLogService.java
View File

@ -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(门户建设) <br/>
* File: SystemLogService.java <br/>
* Class: com.yxt.anrui.portal.biz.systemlog.SystemLogService <br/>
* Description: 系统日志表 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class SystemLogService extends MybatisBaseService<SystemLogMapper, SystemLog> {
@Autowired
SystemLogFeign systemLogFeign;
public ResultBean<PagerVo<SystemLogVo>> listPage(PagerQuery<SystemLogQuery> pq) {
return systemLogFeign.listPage(pq);
}
public ResultBean<List<SystemLogVo>> listAll(SystemLogQuery query) {
return systemLogFeign.list();
}
public ResultBean<PagerVo<SystemLogVo>> listPageVo(PagerQuery<SystemLogQuery> pq) {
return systemLogFeign.listPage(pq);
}
public ResultBean<List<SystemLogVo>> listAllVo(SystemLogQuery query) {
return systemLogFeign.listAll(query);
}
public ResultBean<List<SystemLogVo>> listVo() {
return systemLogFeign.list();
}
public void saveOrUpdateDto(SystemLogDto dto){
systemLogFeign.save(dto);
}
public ResultBean<SystemLogVo> fetchByIdVo(String id){
return systemLogFeign.fetch(id);
}
}

44
wms/src/main/java/com/yxt/wms/biz/func/systemlog/SystemLogVo.java
View File

@ -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(门户建设) <br/>
* File: SystemLogVo.java <br/>
* Class: com.yxt.anrui.portal.api.systemlog.SystemLogVo <br/>
* Description: 系统日志表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:30 <br/>
*
* @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;
}

65
wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAndBillDetailVo.java
View File

@ -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<WarehouseAnsBillDetail> warehouseAnsBillDetails =new ArrayList<>();
}

2
wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillQuery.java
View File

@ -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;//权限等级

8
wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillService.java
View File

@ -48,7 +48,13 @@ public class WarehouseAnsBillService extends MybatisBaseService<WarehouseAnsBill
return wmsAnsBillFeign.saveOrUpdate(dto);
}
public ResultBean<PagerVo<WarehouseAndBillDetailVo>> listPageAns(PagerQuery<WarehouseAnsBillQuery> 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<PagerVo<WarehouseAnsBillVo>> listPages(PagerQuery<WarehouseAnsBillQuery> pq) {
WarehouseAnsBillQuery query=pq.getParams();
DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData();

68
wms/src/main/java/com/yxt/wms/feign/portal/systemlog/SystemLogFeign.java
View File

@ -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(门户建设) <br/>
* File: SystemLogFeign.java <br/>
* Class: com.yxt.anrui.portal.api.systemlog.SystemLogFeign <br/>
* Description: 系统日志表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:30 <br/>
*
* @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<PagerVo<SystemLogVo>> listPage(@RequestBody PagerQuery<SystemLogQuery> pq);
@ApiOperation("根据条件查询所有数据列表")
@PostMapping("/listAll")
public ResultBean<List<SystemLogVo>> listAll(@RequestBody SystemLogQuery query);
@ApiOperation("所有数据列表")
@GetMapping("/list")
public ResultBean<List<SystemLogVo>> 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<SystemLogVo> fetch(@PathVariable("id") String id);
}

67
wms/src/main/java/com/yxt/wms/feign/portal/systemlog/SystemLogFeignFallback.java
View File

@ -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(门户建设) <br/>
* File: SystemLogFeignFallback.java <br/>
* Class: com.yxt.anrui.portal.api.systemlog.SystemLogFeignFallback <br/>
* Description: 系统日志表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:30 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Component
public class SystemLogFeignFallback implements SystemLogFeign {
@Override
public ResultBean<PagerVo<SystemLogVo>> listPage(PagerQuery<SystemLogQuery> pq){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui_portal/systemlog/listPage无法访问");
}
@Override
public ResultBean<List<SystemLogVo>> listAll(SystemLogQuery query){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui_portal/systemlog/listAll无法访问");
}
@Override
public ResultBean<List<SystemLogVo>> 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<SystemLogVo> fetch(String id){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui_portal/systemlog/fetch无法访问");
}
}

48
wms/src/main/java/com/yxt/wms/feign/warehouse/purchaseinventorybill/PurchaseInventoryBillFeign.java
View File

@ -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<PagerVo<PurchaseInventoryBillPageVo>> listPage(@RequestBody PagerQuery<PurchaseInventoryBillQuery> pq);
@ApiOperation("新增修改保存")
@PostMapping("/saveOrUpdate")
ResultBean<String> saveOrUpdate(@RequestBody PurchaseInventoryBillDto2 dto);
@ApiOperation("采购入库单据编辑初始化/详情")
@GetMapping("/selectByBillSid")
ResultBean<PurchaseInventoryBillInitVo> selectByBillSid(@RequestParam("sid") String sid);
@ApiOperation("确认")
@PostMapping("/confirm")
ResultBean<String> confirm(@RequestBody PurchaseInventoryBillDto2 dto);
@ApiOperation("删除/批量删除")
@DeleteMapping("/delBySids")
ResultBean delBySids(@RequestBody String[] sids);
}

59
wms/src/main/java/com/yxt/wms/feign/warehouse/purchaseinventorybill/PurchaseInventoryBillFeignFallback.java
View File

@ -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(门户建设) <br/>
* File: SysRoleFeignFallback.java <br/>
* Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeignFallback <br/>
* Description: 角色. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2021-08-03 00:24:29 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Component
public class PurchaseInventoryBillFeignFallback implements PurchaseInventoryBillFeign {
@Override
public ResultBean<PagerVo<PurchaseInventoryBillPageVo>> listPage(PagerQuery<PurchaseInventoryBillQuery> pq) {
return null;
}
@Override
public ResultBean<String> saveOrUpdate(PurchaseInventoryBillDto2 dto) {
return null;
}
@Override
public ResultBean<PurchaseInventoryBillInitVo> selectByBillSid(String sid) {
return null;
}
@Override
public ResultBean<String> confirm(PurchaseInventoryBillDto2 dto) {
return null;
}
@Override
public ResultBean delBySids(String[] sids) {
return null;
}
}

9
wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeign.java
View File

@ -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<PagerVo<WarehouseAnsBillVo>> listPage(@RequestBody PagerQuery<WarehouseAnsBillQuery> pagerQuery);
@PostMapping("listPageAns")
@ApiOperation("选择预约单分页列表")
ResultBean<PagerVo<WarehouseAndBillDetailVo>> listPageAns(@RequestBody PagerQuery<WarehouseAnsBillQuery> pagerQuery);
@GetMapping("details")
@ApiOperation("详情")
ResultBean<WarehouseAnsDetailsVo> details(@RequestParam("sid") String sid);

10
wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseansbill/WarehouseAnsBillFeignFallback.java
View File

@ -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<PagerVo<WarehouseAndBillDetailVo>> listPageAns(PagerQuery<WarehouseAnsBillQuery> pagerQuery) {
return null;
}
@Override
public ResultBean<WarehouseAnsDetailsVo> details(String sid) {
return null;

Write Preview
Loading…
Cancel
Save