diff --git a/zt-module-base/zt-module-base-server/pom.xml b/zt-module-base/zt-module-base-server/pom.xml index 4d26359f..7cb935a0 100644 --- a/zt-module-base/zt-module-base-server/pom.xml +++ b/zt-module-base/zt-module-base-server/pom.xml @@ -169,8 +169,12 @@ com.zt.plat zt-module-contract-order-api - 3.0.47-SNAPSHOT - compile + ${revision} + + + com.zt.plat + zt-module-receive-deliver-api + ${revision} diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/plandate/PlanDateController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/plandate/PlanDateController.java index 3cfe3265..7ac04f9c 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/plandate/PlanDateController.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/plandate/PlanDateController.java @@ -113,7 +113,7 @@ public class PlanDateController implements BusinessControllerMarker { @GetMapping("/tree/list-all") @Operation(summary = "查询所有计划数据（树形结构）") @PreAuthorize("@ss.hasPermission('base:plan-date:query')") - public CommonResult> listAllPlanDateTree() { - return success(planDateService.listPlanDateTree()); + public CommonResult> listAllPlanDateTree(@Valid PlanDatePageReqVO pageReqVO) { + return success(planDateService.listPlanDateTree(pageReqVO)); } } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/plandate/RealTimeReportsController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/plandate/RealTimeReportsController.java new file mode 100644 index 00000000..76a70747 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/plandate/RealTimeReportsController.java @@ -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)); + } +} diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/plandate/vo/RealTimeReportsTreeRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/plandate/vo/RealTimeReportsTreeRespVO.java new file mode 100644 index 00000000..1ad40846 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/plandate/vo/RealTimeReportsTreeRespVO.java @@ -0,0 +1,7 @@ +package com.zt.plat.module.base.controller.admin.plandate.vo; + +import lombok.Data; + +@Data +public class RealTimeReportsTreeRespVO { +} diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/plandate/PlanDateService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/plandate/PlanDateService.java index f38ad8a4..4f505a10 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/plandate/PlanDateService.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/plandate/PlanDateService.java @@ -74,5 +74,5 @@ public interface PlanDateService { * * @return 计划数据树 */ - List listPlanDateTree(); + List listPlanDateTree(PlanDatePageReqVO pageReqVO); } \ No newline at end of file diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/plandate/PlanDateServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/plandate/PlanDateServiceImpl.java index a8f67429..79d35d1b 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/plandate/PlanDateServiceImpl.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/plandate/PlanDateServiceImpl.java @@ -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 listPlanDateTree() { + public List listPlanDateTree(PlanDatePageReqVO reqVO) { // 1. 全量查询所有未删除的计划数据 - List allPlanDate = planDateMapper.selectList(); + List allPlanDate = planDateMapper.selectList( + new LambdaQueryWrapperX() + .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(); } diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/plandate/RealTimeReportsService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/plandate/RealTimeReportsService.java new file mode 100644 index 00000000..2676cc8f --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/plandate/RealTimeReportsService.java @@ -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 tree(PlanDatePageReqVO reqVO); +} diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/plandate/RealTimeReportsServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/plandate/RealTimeReportsServiceImpl.java new file mode 100644 index 00000000..dcbfca30 --- /dev/null +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/plandate/RealTimeReportsServiceImpl.java @@ -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 tree(PlanDatePageReqVO reqVO) { +// List planDate = planDateService.listPlanDateTree(reqVO); +// BillMainExecutionVolumeReqDTO billMainExecutionVolumeReqDTO=new BillMainExecutionVolumeReqDTO(); +// CommonResult> billMainExecutionVolumeList = billMainApi.getBillMainExecutionVolumeList(billMainExecutionVolumeReqDTO); +// return new ArrayList<>(); +// } +//} diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderOrderPageReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderOrderPageReqVO.java index 47d8016b..57d18281 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderOrderPageReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderOrderPageReqVO.java @@ -138,5 +138,7 @@ public class EntrustOrderOrderPageReqVO extends PageParam { private String sendWarehouseName; @Schema(description = "发货库位编码", example = "张三") private String sendWarehouseNumber; + @Schema(description = "物权转移", example = "张三") + private String meteringType; } \ No newline at end of file diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderOrderRespVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderOrderRespVO.java index 447ef01a..dbeac43c 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderOrderRespVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderOrderRespVO.java @@ -187,4 +187,6 @@ public class EntrustOrderOrderRespVO { @ExcelProperty("发货库位编码") @Schema(description = "发货库位编码", example = "张三") private String sendWarehouseNumber; + @Schema(description = "物权转移", example = "张三") + private String meteringType; } \ No newline at end of file diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderOrderSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderOrderSaveReqVO.java index f0fb664b..abeb22d4 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderOrderSaveReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderOrderSaveReqVO.java @@ -159,4 +159,6 @@ public class EntrustOrderOrderSaveReqVO { private String sendWarehouseName; @Schema(description = "发货库位编码", example = "张三") private String sendWarehouseNumber; + @Schema(description = "物权转移", example = "张三") + private String meteringType; } \ No newline at end of file diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/entrustorder/EntrustOrderOrderDO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/entrustorder/EntrustOrderOrderDO.java index c6095bcb..c7aa3033 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/entrustorder/EntrustOrderOrderDO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/entrustorder/EntrustOrderOrderDO.java @@ -252,4 +252,9 @@ public class EntrustOrderOrderDO extends BusinessBaseDO { */ @TableField("SND_WRH_NUM") private String sendWarehouseNumber; + /** + * 物权转移(字典：ASY_MTNG_TP) + */ + @TableField("MTNG_TP") + private String meteringType; } \ No newline at end of file diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/entrustorder/EntrustOrderOrderServiceImplImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/entrustorder/EntrustOrderOrderServiceImplImpl.java index 73c39b45..bd70b6f7 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/entrustorder/EntrustOrderOrderServiceImplImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/entrustorder/EntrustOrderOrderServiceImplImpl.java @@ -345,7 +345,7 @@ public class EntrustOrderOrderServiceImplImpl implements EntrustOrderOrderServic private void buildErp062Data(ErpOrderUpdateReqVO erpOrderUpdateReqVO, EntrustOrderOrderDO order, List entrustOrderDetailList) { erpOrderUpdateReqVO .setPoNumber(order.getOrderSAPNumber()) - .setDeleteInd(order.getDeleted() ? "1" : null) + // .setDeleteInd(order.getDeleted() ? "1" : null) .setCurrency(order.getCurrencyNumber()) .setExchRate(order.getExchangeRate()); //exte @@ -372,7 +372,7 @@ public class EntrustOrderOrderServiceImplImpl implements EntrustOrderOrderServic item.setItem_cat(CONSTANTS_L);//科目分配类别 item.setMatl_group(detail.getMaterialGroup());//物料组 item.setShort_text(detail.getShortText());//短文本 - item.setDelete_ind(detail.getDeleted() ? "1" : null);//行项目删除标识 + item.setDelete_ind(null);//行项目删除标识 items.add(item); ErpOrderUpdateReqVO.comp comp = new ErpOrderUpdateReqVO.comp(); diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpOrderUpdateReqVO.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpOrderUpdateReqVO.java index 6cb8991b..2b4054be 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpOrderUpdateReqVO.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpOrderUpdateReqVO.java @@ -222,10 +222,49 @@ public class ErpOrderUpdateReqVO { // private String subNumber; // } +// @Data +// public static class comp { +// @Schema(description = "行号（EBELP）", requiredMode = Schema.RequiredMode.REQUIRED, example = "00010") +// @NotEmpty(message = "行号不能为空") +// @ExcelProperty("行号") +// private Long po_item; +// +// @Schema(description = "计划行号（ETENR），从1开始编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") +// @NotNull(message = "计划行号不能为空") +// @ExcelProperty("计划行号") +// private Integer sched_line; +// +// @Schema(description = "项目编号（RSPOS），从1开始编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") +// @NotNull(message = "项目编号不能为空") +// @ExcelProperty("项目编号") +// private Integer item_no; +// +// @Schema(description = "加工前物料号（MATNR）", requiredMode = Schema.RequiredMode.REQUIRED, example = "M0020001") +// @NotEmpty(message = "加工前物料号不能为空") +// @ExcelProperty("加工前物料号") +// private String material; +// +// @Schema(description = "委托加工发货工厂（PLANT）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1001") +// @NotEmpty(message = "委托加工发货工厂不能为空") +// @ExcelProperty("委托发货工厂") +// private String plant; +// +// @Schema(description = "委托加工需求数量（MENGE），保留3位小数", requiredMode = Schema.RequiredMode.REQUIRED, example = "95.000") +// @NotNull(message = "委托加工需求数量不能为空") +// @ExcelProperty("委托需求数量") +// private BigDecimal entry_quantity; +// +// @Schema(description = "组件计量单位（MEINS），为空使用基本计量单位", example = "PC") +// @ExcelProperty("组件计量单位") +// private String entry_uom; +// } + + @Data + @Schema(description = "委托加工物料comp更新请求VO") // 补充Schema注解（可选，规范） public static class comp { @Schema(description = "行号（EBELP）", requiredMode = Schema.RequiredMode.REQUIRED, example = "00010") - @NotEmpty(message = "行号不能为空") + @NotNull(message = "行号不能为空") // 修正：Long类型用@NotNull，而非@NotEmpty @ExcelProperty("行号") private Long po_item; @@ -258,5 +297,4 @@ public class ErpOrderUpdateReqVO { @ExcelProperty("组件计量单位") private String entry_uom; } - }