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

委托加工添加发货工厂字段和明细添加金属元素字段

Browse Source
This commit is contained in:
潘荣晟
2026-02-09 16:14:35 +08:00
parent 287ec65de4
commit c8302e4d23
14 changed files with 173 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zt-module-base/zt-module-base-server/pom.xml
View File

@@ -169,8 +169,12 @@
<dependency>
<groupId>com.zt.plat</groupId>
<artifactId>zt-module-contract-order-api</artifactId>
<version>3.0.47-SNAPSHOT</version>
<scope>compile</scope>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.zt.plat</groupId>
<artifactId>zt-module-receive-deliver-api</artifactId>
<version>${revision}</version>
</dependency>
</dependencies>

4
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/plandate/PlanDateController.java
View File

@@ -113,7 +113,7 @@ public class PlanDateController implements BusinessControllerMarker {
@GetMapping("/tree/list-all")
@Operation(summary = "查询所有计划数据（树形结构）")
@PreAuthorize("@ss.hasPermission('base:plan-date:query')")
public CommonResult<List<PlanDateRespVO>> listAllPlanDateTree() {
return success(planDateService.listPlanDateTree());
public CommonResult<List<PlanDateRespVO>> listAllPlanDateTree(@Valid PlanDatePageReqVO pageReqVO) {
return success(planDateService.listPlanDateTree(pageReqVO));
}
}

35
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/plandate/RealTimeReportsController.java Normal file
View File

@@ -0,0 +1,35 @@
package com.zt.plat.module.base.controller.admin.plandate;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.module.base.controller.admin.plandate.vo.PlanDatePageReqVO;
import com.zt.plat.module.base.controller.admin.plandate.vo.PlanDateRespVO;
import com.zt.plat.module.base.service.plandate.RealTimeReportsService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import static com.zt.plat.framework.common.pojo.CommonResult.success;
@Tag(name = "管理后台 - 计划追踪报表")
@RestController
@RequestMapping("/base/real-time-reports")
@Validated
public class RealTimeReportsController {
@Resource
private RealTimeReportsService realTimeReportsService;
@GetMapping("/tree")
@Operation(summary = "查询追踪计划数据（树形结构）")
@PreAuthorize("@ss.hasPermission('base:plan-date:query')")
public CommonResult<?> listAllPlanDateTree(@Valid PlanDatePageReqVO pageReqVO) {
return success(realTimeReportsService.tree(pageReqVO));
}
}

7
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/plandate/vo/RealTimeReportsTreeRespVO.java Normal file
View File

@@ -0,0 +1,7 @@
package com.zt.plat.module.base.controller.admin.plandate.vo;
import lombok.Data;
@Data
public class RealTimeReportsTreeRespVO {
}

2
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/plandate/PlanDateService.java
View File

@@ -74,5 +74,5 @@ public interface PlanDateService {
*
* @return 计划数据树
*/
List<PlanDateRespVO> listPlanDateTree();
List<PlanDateRespVO> listPlanDateTree(PlanDatePageReqVO pageReqVO);
}

27
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/plandate/PlanDateServiceImpl.java
View File

@@ -1,6 +1,7 @@
package com.zt.plat.module.base.service.plandate;
import cn.hutool.core.collection.CollUtil;
import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.zt.plat.module.base.controller.admin.plandate.vo.PlanDatePageReqVO;
import com.zt.plat.module.base.controller.admin.plandate.vo.PlanDateRespVO;
import com.zt.plat.module.base.controller.admin.plandate.vo.PlanDateSaveReqVO;
@@ -137,9 +138,31 @@ public class PlanDateServiceImpl implements PlanDateService {
* @return 树形结构的计划数据RespVO列表
*/
@Override
public List<PlanDateRespVO> listPlanDateTree() {
public List<PlanDateRespVO> listPlanDateTree(PlanDatePageReqVO reqVO) {
// 1. 全量查询所有未删除的计划数据
List<PlanDateDO> allPlanDate = planDateMapper.selectList();
List<PlanDateDO> allPlanDate = planDateMapper.selectList(
new LambdaQueryWrapperX<PlanDateDO>()
.likeIfPresent(PlanDateDO::getPlanName, reqVO.getPlanName())
.eqIfPresent(PlanDateDO::getPlanCoding, reqVO.getPlanCoding())
.eqIfPresent(PlanDateDO::getParentId, reqVO.getParentId())
.eqIfPresent(PlanDateDO::getYear, reqVO.getYear())
.eqIfPresent(PlanDateDO::getInitialValue, reqVO.getInitialValue())
.eqIfPresent(PlanDateDO::getAverageValue, reqVO.getAverageValue())
.eqIfPresent(PlanDateDO::getSumValue, reqVO.getSumValue())
.eqIfPresent(PlanDateDO::getJanuary, reqVO.getJanuary())
.eqIfPresent(PlanDateDO::getFebruary, reqVO.getFebruary())
.eqIfPresent(PlanDateDO::getMarch, reqVO.getMarch())
.eqIfPresent(PlanDateDO::getApril, reqVO.getApril())
.eqIfPresent(PlanDateDO::getMay, reqVO.getMay())
.eqIfPresent(PlanDateDO::getJune, reqVO.getJune())
.eqIfPresent(PlanDateDO::getJuly, reqVO.getJuly())
.eqIfPresent(PlanDateDO::getAugust, reqVO.getAugust())
.eqIfPresent(PlanDateDO::getSeptember, reqVO.getSeptember())
.eqIfPresent(PlanDateDO::getOctober, reqVO.getOctober())
.eqIfPresent(PlanDateDO::getNovember, reqVO.getNovember())
.eqIfPresent(PlanDateDO::getDecember, reqVO.getDecember())
.betweenIfPresent(PlanDateDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(PlanDateDO::getId));
if (CollUtil.isEmpty(allPlanDate)) {
return Collections.emptyList();
}

10
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/plandate/RealTimeReportsService.java Normal file
View File

@@ -0,0 +1,10 @@
package com.zt.plat.module.base.service.plandate;
import com.zt.plat.module.base.controller.admin.plandate.vo.PlanDatePageReqVO;
import com.zt.plat.module.base.controller.admin.plandate.vo.RealTimeReportsTreeRespVO;
import java.util.List;
public interface RealTimeReportsService {
List<RealTimeReportsTreeRespVO> tree(PlanDatePageReqVO reqVO);
}

34
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/plandate/RealTimeReportsServiceImpl.java Normal file
View File

@@ -0,0 +1,34 @@
//package com.zt.plat.module.base.service.plandate;
//
//import com.zt.plat.framework.common.pojo.CommonResult;
//import com.zt.plat.module.base.controller.admin.plandate.vo.PlanDatePageReqVO;
//import com.zt.plat.module.base.controller.admin.plandate.vo.PlanDateRespVO;
//import com.zt.plat.module.base.controller.admin.plandate.vo.RealTimeReportsTreeRespVO;
//import com.zt.plat.module.receivedeliver.api.bill.BillMainApi;
//import com.zt.plat.module.receivedeliver.api.bill.dto.billMain.BillMainExecutionVolumeReqDTO;
//import com.zt.plat.module.receivedeliver.api.bill.dto.billMain.BillMainExecutionVolumeStatisticsRespDTO;
//import jakarta.annotation.Resource;
//import org.springframework.stereotype.Service;
//import org.springframework.validation.annotation.Validated;
//
//import java.util.ArrayList;
//import java.util.List;
//
//@Service
//@Validated
//public class RealTimeReportsServiceImpl implements RealTimeReportsService{
//
// @Resource
// private PlanDateService planDateService;
// @Resource
// private PlanOrderService planOrderService;
// @Resource
// private BillMainApi billMainApi;
// @Override
// public List<RealTimeReportsTreeRespVO> tree(PlanDatePageReqVO reqVO) {
// List<PlanDateRespVO> planDate = planDateService.listPlanDateTree(reqVO);
// BillMainExecutionVolumeReqDTO billMainExecutionVolumeReqDTO=new BillMainExecutionVolumeReqDTO();
// CommonResult<List<BillMainExecutionVolumeStatisticsRespDTO>> billMainExecutionVolumeList = billMainApi.getBillMainExecutionVolumeList(billMainExecutionVolumeReqDTO);
// return new ArrayList<>();
// }
//}

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

@@ -138,5 +138,7 @@ public class EntrustOrderOrderPageReqVO extends PageParam {
private String sendWarehouseName;
@Schema(description = "发货库位编码", example = "张三")
private String sendWarehouseNumber;
@Schema(description = "物权转移", example = "张三")
private String meteringType;
}

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

@@ -187,4 +187,6 @@ public class EntrustOrderOrderRespVO {
@ExcelProperty("发货库位编码")
@Schema(description = "发货库位编码", example = "张三")
private String sendWarehouseNumber;
@Schema(description = "物权转移", example = "张三")
private String meteringType;
}

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