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

委托加工和来料加工feign接口字段映射

Browse Source
This commit is contained in:
潘荣晟
2026-02-11 17:19:33 +08:00
parent a6f3b028fb
commit 7142fcc86f
4 changed files with 233 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/OrderApi.java
View File

@@ -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<PageResult<OrderDTO>> queryOrderPlanData(@RequestBody @Valid OrderAndPlanDataReqDTO reqVO);
@PostMapping(PREFIX + "/get-entrust-order-detail-by-id")
@Operation(summary = "通过委托加工订单明细id获取明细详情", description = "通过委托加工订单明细id获取明细详情")
CommonResult<EntrustOrderDetailDTO> getEntrustOrderDetailById(@RequestParam("id") Long id);
@PostMapping(PREFIX + "/get-original-material-order-detail-by-id")
@Operation(summary = "通过来料加工订单明细id获取明细详情", description = "通过来料加工订单明细id获取明细详情")
CommonResult<OriginalMaterialProcessingDetailDTO> getOriginalMaterialOrderDetailById(@RequestParam("id") Long id);
}

116
zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/order/EntrustOrderDetailDTO.java Normal file
View File

File diff suppressed because it is too large Load Diff

88
zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/order/OriginalMaterialProcessingDetailDTO.java Normal file
View File

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

20
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java
View File

@@ -308,6 +308,26 @@ public class OrderApiImpl implements OrderApi {
return success(new PageResult<>(bean, pageResult.getTotal()));
}
@Override
public CommonResult<EntrustOrderDetailDTO> getEntrustOrderDetailById(Long id) {
EntrustOrderDetailDO entrustOrderDetailDO = SpringUtil.getBean(EntrustOrderDetailMapper.class).selectOne(
new LambdaQueryWrapperX<EntrustOrderDetailDO>()
.eq(EntrustOrderDetailDO::getId, id)
.eq(EntrustOrderDetailDO::getIsEnable, '1')
);
return success(BeanUtils.toBean(entrustOrderDetailDO, EntrustOrderDetailDTO.class));
}
@Override
public CommonResult<OriginalMaterialProcessingDetailDTO> getOriginalMaterialOrderDetailById(Long id) {
OriginalMaterialProcessingDetailDO originalMaterialProcessingDetailDO = SpringUtil.getBean(OriginalMaterialProcessingDetailMapper.class).selectOne(
new LambdaQueryWrapperX<OriginalMaterialProcessingDetailDO>()
.eq(OriginalMaterialProcessingDetailDO::getId, id)
.eq(OriginalMaterialProcessingDetailDO::getIsEnable, '1')
);
return success(BeanUtils.toBean(originalMaterialProcessingDetailDO, OriginalMaterialProcessingDetailDTO.class));
}
private List<SalesOrderDO> getOrderByIds(List<Long> ids) {
return SpringUtil.getBean(SalesOrderMapper.class).selectList(SalesOrderDO::getId, ids); //订单主表都是同一个所以使用销售的主表暂时承载数据
}