zgty/zt-base
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into test

Browse Source
This commit is contained in:
潘荣晟
2026-02-03 15:51:32 +08:00
parent 2b2404c6f2 6e72c30207
commit 291ede4093
11 changed files with 217 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderDetailPageReqVO.java
View File

@@ -99,5 +99,9 @@ public class EntrustOrderDetailPageReqVO extends PageParam {
//税率
@Schema(description = "税率")
private BigDecimal taxRate;
@Schema(description = "回收率")
private BigDecimal recoveryRate;
@Schema(description = "行项目号")
private Integer lineNumber;
}

6
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderDetailRespVO.java
View File

@@ -141,4 +141,10 @@ public class EntrustOrderDetailRespVO {
@Schema(description = "税率")
@ExcelProperty("税率")
private BigDecimal taxRate;
@Schema(description = "回收率")
@ExcelProperty("回收率")
private BigDecimal recoveryRate;
@Schema(description = "行项目号")
@ExcelProperty("行项目号")
private Integer lineNumber;
}

4
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderDetailSaveReqVO.java
View File

@@ -101,4 +101,8 @@ public class EntrustOrderDetailSaveReqVO {
private String sendMaterialName;
@Schema(description = "税率")
private BigDecimal taxRate;
@Schema(description = "回收率")
private BigDecimal recoveryRate;
@Schema(description = "行项目号")
private Integer lineNumber;
}

2
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/PurchaseOrderController.java
View File

@@ -149,7 +149,7 @@ public class PurchaseOrderController implements BusinessControllerMarker {
public CommonResult<?> submitErp061(@RequestBody @Validated @NotEmpty(message = "采购订单id不能为空") List<String> idsStr) {
List<Long> ids = idsStr.stream().map(Long::valueOf).toList();
// todo 推送ERP订单
return customize(purchaseOrderService.submitErp061(ids),200,"推送成功");
return success(purchaseOrderService.submitErp061(ids));
}
@PostMapping("/submit-erp062")

6
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/entrustorder/EntrustOrderDetailDO.java
View File

@@ -170,4 +170,10 @@ public class EntrustOrderDetailDO extends BusinessBaseDO {
@TableField("TAX_RTE")
private BigDecimal taxRate;
@TableField("RCV_RTE")
private BigDecimal recoveryRate;
@TableField("LINE_NUM")
private Integer lineNumber;
}

2
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/entrustorder/EntrustOrderDetailMapper.java
View File

@@ -39,6 +39,8 @@ public interface EntrustOrderDetailMapper extends BaseMapperX<EntrustOrderDetail
.betweenIfPresent(EntrustOrderDetailDO::getCreateTime, reqVO.getCreateTime())
.likeIfPresent(EntrustOrderDetailDO::getRemark, reqVO.getRemark())
.eqIfPresent(EntrustOrderDetailDO::getTaxRate, reqVO.getTaxRate())
.eqIfPresent(EntrustOrderDetailDO::getRecoveryRate, reqVO.getRecoveryRate())
.eqIfPresent(EntrustOrderDetailDO::getLineNumber, reqVO.getLineNumber())
.orderByDesc(EntrustOrderDetailDO::getId));
}

111
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java
View File

File diff suppressed because it is too large Load Diff

2
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpWarehouseDO.java
View File

@@ -20,7 +20,7 @@ import lombok.*;
/**
* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO
*/
public class ErpWarehouseDO extends BusinessBaseDO {
public class ErpWarehouseDO extends BaseDO {
/**
* 主键

6
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpWarehouseMapper.java
View File

@@ -8,6 +8,7 @@ import com.zt.plat.module.erp.controller.admin.erp.vo.ErpWarehousePageReqVO;
import com.zt.plat.module.erp.dal.dataobject.erp.ErpSalesOrganizationDO;
import com.zt.plat.module.erp.dal.dataobject.erp.ErpWarehouseDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -40,5 +41,10 @@ public interface ErpWarehouseMapper extends BaseMapperX<ErpWarehouseDO> {
.orderByDesc(ErpWarehouseDO::getId));
}
List<ErpWarehouseDO> selectWarehouseByDynamicParams(
@Param("paramReqVO") ErpWarehousePageReqVO reqVO,
@Param("pageNum") Integer pageNum,
@Param("pageSize") Integer pageSize);
Long selectWarehouseByDynamicParamsCount(@Param("paramReqVO") ErpWarehousePageReqVO reqVO);
}

39
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpWarehouseServiceImpl.java
View File

@@ -192,31 +192,32 @@ public PageResult<ErpWarehouseDO> getErpWarehousePageDistinctByFactory(ErpWareho
@Override
public PageResult<ErpWarehouseDO> getErpWarehousePage(ErpWarehousePageReqVO pageReqVO) {
// PageResult<ErpWarehouseRespVO> erpWarehouseRespVOPageResult = BeanUtils.toBean(erpWarehouseMapper.selectPage(pageReqVO), ErpWarehouseRespVO.class);
return new PageResult<>(erpWarehouseMapper.selectWarehouseByDynamicParams(pageReqVO, pageReqVO.getPageNo(), pageReqVO.getPageSize()), erpWarehouseMapper.selectWarehouseByDynamicParamsCount(pageReqVO));
// PageResult<ErpWarehouseRespVO> erpWarehouseRespVOPageResult = BeanUtils.toBean(erpWarehouseMapper.selectPage(pageReqVO), ErpWarehouseRespVO.class);
// if (erpWarehouseRespVOPageResult.getList() == null) {
// return erpWarehouseRespVOPageResult;
// }
// erpWarehouseRespVOPageResult.getList().forEach(this::setWarehouseFactoryInfo);
// return erpWarehouseRespVOPageResult;
// 获取分页数据
List<ErpWarehouseDO> list = erpWarehouseMapper.getPageByReq(pageReqVO);
if (list == null) {
list = CollUtil.newArrayList();
}
// 分页处理
int pageNo = pageReqVO.getPageNo();
int pageSize = pageReqVO.getPageSize();
int total = list.size();
// 计算分页起始和结束位置
int fromIndex = (pageNo - 1) * pageSize;
int toIndex = Math.min(fromIndex + pageSize, total);
// 如果起始位置超出范围，则返回空列表
if (fromIndex >= total) {
return new PageResult<>(new ArrayList<>(), (long) total);
}
// 截取当前页数据
List<ErpWarehouseDO> pageList = list.subList(fromIndex, toIndex);
return new PageResult<>(pageList, (long) total);
// List<ErpWarehouseDO> list = erpWarehouseMapper.getPageByReq(pageReqVO);
// if (list == null) {
// list = CollUtil.newArrayList();
// }
// // 分页处理
// int pageNo = pageReqVO.getPageNo();
// int pageSize = pageReqVO.getPageSize();
// int total = list.size();
// // 计算分页起始和结束位置
// int fromIndex = (pageNo - 1) * pageSize;
// int toIndex = Math.min(fromIndex + pageSize, total);
// // 如果起始位置超出范围，则返回空列表
// if (fromIndex >= total) {
// return new PageResult<>(new ArrayList<>(), (long) total);
// }
// // 截取当前页数据
// List<ErpWarehouseDO> pageList = list.subList(fromIndex, toIndex);
// return new PageResult<>(pageList, (long) total);
}
// 设置主物料信息

Some files were not shown because too many files have changed in this diff Show More