diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/OrderApi.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/OrderApi.java index 012dfd1e..59c8450b 100644 --- a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/OrderApi.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/OrderApi.java @@ -2,10 +2,7 @@ package com.zt.plat.module.contractorder.api; import com.zt.plat.framework.common.pojo.CommonResult; import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.module.contractorder.api.dto.order.OrderAndPlanDataReqDTO; -import com.zt.plat.module.contractorder.api.dto.order.OrderDTO; -import com.zt.plat.module.contractorder.api.dto.order.SalesOrdDtlDTO; -import com.zt.plat.module.contractorder.api.dto.order.UpdateOrderLstQtyDTO; +import com.zt.plat.module.contractorder.api.dto.order.*; import com.zt.plat.module.contractorder.enums.ApiConstants; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -50,4 +47,12 @@ public interface OrderApi { @PostMapping(PREFIX + "/query-order-plan-data") @Operation(summary = "根据计划和订单的参数查询相关的订单", description = "根据计划和订单的参数查询相关的订单") CommonResult> queryOrderPlanData(@RequestBody @Valid OrderAndPlanDataReqDTO reqVO); + + @PostMapping(PREFIX + "/get-entrust-order-detail-by-id") + @Operation(summary = "通过委托加工订单明细id获取明细详情", description = "通过委托加工订单明细id获取明细详情") + CommonResult getEntrustOrderDetailById(@RequestParam("id") Long id); + + @PostMapping(PREFIX + "/get-original-material-order-detail-by-id") + @Operation(summary = "通过来料加工订单明细id获取明细详情", description = "通过来料加工订单明细id获取明细详情") + CommonResult getOriginalMaterialOrderDetailById(@RequestParam("id") Long id); } diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/order/EntrustOrderDetailDTO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/order/EntrustOrderDetailDTO.java new file mode 100644 index 00000000..b413464d --- /dev/null +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/order/EntrustOrderDetailDTO.java @@ -0,0 +1,116 @@ +package com.zt.plat.module.contractorder.api.dto.order; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; +@Schema(description = "委托订单明细DTO") +@Data +public class EntrustOrderDetailDTO { + @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "8625") + + private Long id; + + @Schema(description = "订单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "8625") + private Long orderId; + + @Schema(description = "发货工厂名称", example = "张三") + private String sendFactoryName; + + @Schema(description = "发货工厂编码") + private String sendFactoryNumber; + + @Schema(description = "发货库位名称", example = "李四") + private String sendWarehouseName; + + @Schema(description = "发货库位编码") + private String sendWarehouseNumber; + + @Schema(description = "收货工厂名称", example = "赵六") + private String receiveFactoryName; + + @Schema(description = "收货工厂编码") + private String receiveFactoryNumber; + + @Schema(description = "收货库位名称", example = "张三") + private String receiveWarehouseName; + @Schema(description = "收货库位编码") + private String receiveWarehouseNumber; + @Schema(description = "发货物料名称", example = "张三") + private String sendMaterialName; + @Schema(description = "发货物料编码", example = "李四") + private String sendMaterialNumber; + @Schema(description = "收货物料名称", example = "王五") + private String receiveMaterialName; + @Schema(description = "收货物料编码", example = "王五") + private String receiveMaterialNumber; + + @Schema(description = "发货计量单位") + private String sendUnit; + @Schema(description = "收货计量单位") + private String receiveUnit; + + @Schema(description = "暂估数量") + private BigDecimal forecastQuantity; + + @Schema(description = "含税单价", example = "24704") + private BigDecimal inTaxUnitPrice; + + @Schema(description = "交货起始日期") + private LocalDateTime deliveryCargoBeginDate; + + @Schema(description = "交货截止日期") + private LocalDateTime deliveryCargoEndDate; + + @Schema(description = "是否启用") + private String isEnable; + + @Schema(description = "短文本") + private String shortText; + + @Schema(description = "创建时间") + private LocalDateTime createTime; + + @Schema(description = "税码") + private String taxNumber; + //科目类别 + @Schema(description = "科目类别") + private String accountingItemType; + //MTRL_CPNT_NUM 物料组 + @Schema(description = "物料组") + private String materialGroup; + //RET_ITM 退货标识 + @Schema(description = "退货标识") + private String returnItem; + //免费标识FREE_ITM + @Schema(description = "免费标识") + private String freeItem; + //VNDB 外部行号 + @Schema(description = "外部行号") + private String externalLineNumber; + //ACTS_CTGR_DTL 科目分配 + @Schema(description = "科目分配") + private String accountingItemAllocation; + @Schema(description = "备注") + private String remark; + @Schema(description = "税率") + private BigDecimal taxRate; + @Schema(description = "回收率") + private BigDecimal recoveryRate; + @Schema(description = "行项目号") + private Integer lineNumber; + + @Schema(description = "删除标识") + private Boolean deleted; + + @Schema(description = "金属元素缩写") + private String elementAbbreviation; + + @Schema(description = "金属元素名称") + private String elementName; + + @Schema(description = "金属元素编码") + private String elementNumber; + +} diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/order/OriginalMaterialProcessingDetailDTO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/order/OriginalMaterialProcessingDetailDTO.java new file mode 100644 index 00000000..64f543a8 --- /dev/null +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/order/OriginalMaterialProcessingDetailDTO.java @@ -0,0 +1,88 @@ +package com.zt.plat.module.contractorder.api.dto.order; + +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; +@Schema(description = "来料处理明细DTO") +@Data +public class OriginalMaterialProcessingDetailDTO { + @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "12973") + private Long id; + @Schema(description = "订单ID", example = "21244") + private Long orderId; + @Schema(description = "收货工厂名称", example = "张三") + private String receiveFactoryName; + @Schema(description = "收货工厂编码") + private String receiveFactoryNumber; + @Schema(description = "收货库位名称", example = "张三") + private String receiveWarehouseName; + @Schema(description = "收货库位编码") + private String receiveWarehouseNumber; + @Schema(description = "发货工厂名称", example = "张三") + private String sendFactoryName; + @Schema(description = "发货工厂编码") + private String sendFactoryNumber; + @Schema(description = "发货库位名称", example = "赵六") + private String sendWarehouseName; + @Schema(description = "发货库位编码") + private String sendWarehouseNumber; + @Schema(description = "物料名称", example = "李四") + private String materialName; + @Schema(description = "物料编码") + private String materialNumber; + @Schema(description = "计量单位") + private String unit; + @Schema(description = "暂估数量") + private BigDecimal forecastQuantity; + @Schema(description = "含税单价", example = "971") + private BigDecimal inTaxUnitPrice; + @Schema(description = "税码") + private String taxNumber; + @Schema(description = "交货起始日期") + private LocalDateTime deliveryCargoBeginDate; + @Schema(description = "交货截止日期") + private LocalDateTime deliveryCargoEndDate; + @Schema(description = "是否启用") + private Boolean isEnable; + @Schema(description = "短文本") + private String shortText; + @Schema(description = "税分类") + private String taxCategory; + @Schema(description = "项目类别") + private String projectCategory; + @Schema(description = "装运地点") + private String shippingPlace; + @Schema(description = "物料科目分配组") + private String materialAssignGroup; + @Schema(description = "总额") + private BigDecimal gross; + @Schema(description = "金属元素名称", example = "王五") + private String metalElementName; + @Schema(description = "金属元素缩写") + private String metalElementAbbreviation; + @Schema(description = "备注") + private String remark; + @Schema(description = "价格条件") + private String priceCondition; + @Schema(description = "创建时间") + private LocalDateTime createTime; + @Schema(description = "删除标识") + private Boolean deleted; + @Schema(description = "金属元素缩写") + private String elementAbbreviation; + @Schema(description = "金属元素名称") + private String elementName; + @Schema(description = "金属元素编码") + private String elementNumber; + @Schema(description = "行号") + private Integer lineNumber; + @Schema(description = "发票类型") + private String invoiceType; + @Schema(description = "物料科目分配组") + private String metalAcctasscatGroup; + @Schema(description = "税率") + private BigDecimal taxRte; +} diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java index b6a3998f..79bcd0b8 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java @@ -308,6 +308,26 @@ public class OrderApiImpl implements OrderApi { return success(new PageResult<>(bean, pageResult.getTotal())); } + @Override + public CommonResult getEntrustOrderDetailById(Long id) { + EntrustOrderDetailDO entrustOrderDetailDO = SpringUtil.getBean(EntrustOrderDetailMapper.class).selectOne( + new LambdaQueryWrapperX() + .eq(EntrustOrderDetailDO::getId, id) + .eq(EntrustOrderDetailDO::getIsEnable, '1') + ); + return success(BeanUtils.toBean(entrustOrderDetailDO, EntrustOrderDetailDTO.class)); + } + + @Override + public CommonResult getOriginalMaterialOrderDetailById(Long id) { + OriginalMaterialProcessingDetailDO originalMaterialProcessingDetailDO = SpringUtil.getBean(OriginalMaterialProcessingDetailMapper.class).selectOne( + new LambdaQueryWrapperX() + .eq(OriginalMaterialProcessingDetailDO::getId, id) + .eq(OriginalMaterialProcessingDetailDO::getIsEnable, '1') + ); + return success(BeanUtils.toBean(originalMaterialProcessingDetailDO, OriginalMaterialProcessingDetailDTO.class)); + } + private List getOrderByIds(List ids) { return SpringUtil.getBean(SalesOrderMapper.class).selectList(SalesOrderDO::getId, ids); //订单主表都是同一个所以使用销售的主表暂时承载数据 }