From c08351a830bdc0ab7617bb1bcbba6b6a0d24b593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E8=8D=A3=E6=99=9F?= <9691125+pan-rongsheng@user.noreply.gitee.com> Date: Wed, 11 Feb 2026 18:13:46 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=BB=91=E5=AE=9A=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/vo/contract/ContractRespVO.java | 2 + .../PurchaseOrderController.java | 7 + .../admin/purchaseorder/vo/OrderRespVO.java | 221 ++++++++++++++++++ .../purchaseorder/PurchaseOrderService.java | 1 + .../PurchaseOrderServiceImpl.java | 83 +++++-- 5 files changed, 301 insertions(+), 13 deletions(-) create mode 100644 zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/OrderRespVO.java diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/ContractRespVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/ContractRespVO.java index 625a3640..e6f97360 100644 --- a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/ContractRespVO.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/ContractRespVO.java @@ -276,6 +276,8 @@ public class ContractRespVO { @Schema(description = "是否信用", example = "1") private String hasCredit; + @Schema(description = "关联合同主键") + private Long relatedContractId; @Schema(description = "收发货规则") private List contractReceiveSends; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/PurchaseOrderController.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/PurchaseOrderController.java index b1030243..a4064955 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/PurchaseOrderController.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/PurchaseOrderController.java @@ -234,5 +234,12 @@ public class PurchaseOrderController implements BusinessControllerMarker { purchaseOrderService.boundOrder(req); return success(true); } + //获取关联订单 + @PostMapping("/get-no-permission") + @Operation(summary = "获取关联订单") + @PreAuthorize("@ss.hasAnyPermissions('base:purchase-order:query')") + public CommonResult getOrder(@RequestParam("id") Long id) { + return success(purchaseOrderService.getOrder(id)); + } } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/OrderRespVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/OrderRespVO.java new file mode 100644 index 00000000..08f20361 --- /dev/null +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/OrderRespVO.java @@ -0,0 +1,221 @@ +package com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.zt.plat.module.contractorder.controller.admin.entrustorder.vo.EntrustOrderDetailRespVO; +import com.zt.plat.module.contractorder.controller.admin.originalmaterialprocessing.vo.OriginalMaterialProcessingDetailRespVO; +import com.zt.plat.module.contractorder.controller.admin.salesorder.vo.SaleOrderDetailsRespVO; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.List; + +@Schema(description = "管理后台 - 采购订单 Response VO") +@Data +@ExcelIgnoreUnannotated +public class OrderRespVO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "6074") + @ExcelProperty("主键") + private Long id; + + @Schema(description = "ERP订单号") + @ExcelProperty("ERP订单号") + private String orderSAPNumber; + + @Schema(description = "订单号", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("订单号") + private String systemOrderNumber; + + @Schema(description = "公司编码;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("公司编码;推送ERP（必须）") + private String cpNum; + + @Schema(description = "客商编码;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("客商编码;推送ERP（必须）") + private String supplierNumber; + + @Schema(description = "客商名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") + @ExcelProperty("客商名称") + private String supplierName; + + @Schema(description = "订单类型(字典:PRCH_ORD_TP);推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @ExcelProperty("订单类型(字典:PRCH_ORD_TP);推送ERP（必须）") + private String type; + + @Schema(description = "凭证日期;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("凭证日期;推送ERP（必须）") + private LocalDateTime voucherDate; + + @Schema(description = "采购组织编码;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("采购组织编码;推送ERP（必须）") + private String purchaseOrganizationCustomsDeclaration; + + @Schema(description = "收货工厂名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") + @ExcelProperty("收货工厂名称") + private String receiveFactoryName; + + @Schema(description = "收货工厂编码;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("收货工厂编码;推送ERP（必须）") + private String receiveFactoryNumber; + + @Schema(description = "收货库位名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五") + @ExcelProperty("收货库位名称") + private String receiveWarehouseName; + + @Schema(description = "收货库位编码;推送ERP", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("收货库位编码;推送ERP") + private String receiveWarehouseNumber; + + @Schema(description = "计量单位") + private String unt; + + @Schema(description = "采购组编码(字典:PRCH_GRP_TP);推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("采购组编码(字典:PRCH_GRP_TP);推送ERP（必须）") + private String purchaseGroup; + + @Schema(description = "货币码(字典:CUR);推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("货币码(字典:CUR);推送ERP（必须）") + private String currencyNumber; + + @Schema(description = "汇率;推送ERP") + @ExcelProperty("汇率;推送ERP") + private BigDecimal exchangeRate; + + @Schema(description = "合同纸质合同号;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("合同纸质合同号;推送ERP（必须）") + private String paperContractNumber; + + @Schema(description = "小协议号;推送ERP") + @ExcelProperty("小协议号;推送ERP") + private String agreementNumber; + + @Schema(description = "备注;推送ERP") + @ExcelProperty("备注;推送ERP") + private String remark; + + @Schema(description = "代理方编码;推送ERP") + @ExcelProperty("代理方编码;推送ERP") + private String agentNumber; + + @Schema(description = "代理方名称", example = "张三") + @ExcelProperty("代理方名称") + private String agentName; + + @Schema(description = "订单编码", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("订单编码") + private String orderNumber; + + @Schema(description = "系统合同编号", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("系统合同编号") + private String contractNumber; + + @Schema(description = "物料编码") + @ExcelProperty("物料编码") + private String materialNumber; + + @Schema(description = "物料名称", example = "王五") + @ExcelProperty("物料名称") + private String materialName; + + @Schema(description = "合同名称", example = "赵六") + @ExcelProperty("合同名称") + private String contractName; + + @Schema(description = "小户头号") + @ExcelProperty("小户头号") + private String tenantNumber; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private LocalDateTime createTime; + + @Schema(description = "ERP公司编号", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("ERP公司编号") + private String erpPurchaseCompanyNumber; + + @Schema(description = "ERP公司名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五") + @ExcelProperty("ERP公司名称") + private String erpPurchaseCompanyName; + + @Schema(description = "ERP客商公司编码", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("ERP客商公司编码") + private String erpSalesCompanyNumber; + + @Schema(description = "ERP客商公司名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") + @ExcelProperty("ERP客商公司名称") + private String erpSalesCompanyName; + + @Schema(description = "采购组织名称", example = "赵六") + @ExcelProperty("采购组织名称") + private String purchaseOrganizationName; + + @Schema(description = "ERP状态(字典: ERP_REQ_STS)", example = "2") + @ExcelProperty("ERP状态(字典: ERP_REQ_STS)") + private String erpStatus; + + @Schema(description = "请求ERP失败原因") + @ExcelProperty("请求ERP失败原因") + private String cause; + + @Schema(description = "订单状态(字典:PRCH_ORD_STS)", example = "2") + @ExcelProperty("订单状态(字典:PRCH_ORD_STS)") + private String status; + + @Schema(description = "采购组名称", example = "张三") + @ExcelProperty("采购组名称") + private String purchaseGroupName; + + @Schema(description = "物料类型(字典:MTRL_TP)", example = "2") + @ExcelProperty("物料类型(字典:MTRL_TP)") + private String mtrlTp; + + @Schema(description = "订单分类(字典：SPLY_BSN_TP)", example = "2") + @ExcelProperty("订单分类") + private String splyBsnTp; + + @Schema(description = "公司名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") + @ExcelProperty("公司名称") + private String cpName; + + @Schema(description = "是否提交审核，value为0或1") + @ExcelProperty("是否提交审核") + private int isPush; + + @Schema(description = "流程实例编号") + @ExcelProperty("流程实例编号") + private String processInstanceId; + + @Schema(description = "流程当前任务节点id") + @ExcelProperty("流程当前任务节点id") + private String taskId; + + @Schema(description = " 审批意见") + @ExcelProperty(" 审批意见") + private String reviewOpinion; + + @Schema(description = "货权转移类型(字典：ASY_MTNG_TP)") + @ExcelProperty("货权转移类型(字典：ASY_MTNG_TP)") + private String meteringType; + + @Schema(description = "erp失败原因") + private String issueCause; + + @Schema(description = "采购订单明细") + @ExcelProperty("采购订单明细") + private List prchOrdDtlRespVOS; + // 销售订单明细 + @Schema(description = "销售订单明细") + @ExcelProperty("销售订单明细") + private List saleOrdDtlRespVOS; + //委托加工 + @Schema(description = "委托加工明细") + @ExcelProperty("委托加工明细") + private List entrustOrdDtlRespVOS; + // 来料 + @Schema(description = "来料明细") + @ExcelProperty("来料明细") + private List originalMaterialProcessingDetailRespVOS; +} diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderService.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderService.java index ada6f8a9..e231301a 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderService.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderService.java @@ -164,4 +164,5 @@ public interface PurchaseOrderService { */ PageResult pageOrderNoPermission(PurchaseOrderPageReqVO pageReqVO); void boundOrder(BoundOrderReqVO reqVO); + OrderRespVO getOrder(Long id); } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java index e3f6bf28..5a5ebbe9 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java @@ -10,6 +10,7 @@ import com.zt.plat.framework.common.pojo.CommonResult; import com.zt.plat.framework.common.pojo.PageParam; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.common.util.object.BeanUtils; +import com.zt.plat.framework.common.util.spring.SpringUtils; import com.zt.plat.framework.datapermission.core.annotation.CompanyDataPermissionIgnore; import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore; import com.zt.plat.framework.security.core.util.SecurityFrameworkUtils; @@ -24,17 +25,27 @@ import com.zt.plat.module.bpm.api.task.BpmTaskApi; import com.zt.plat.module.bpm.api.task.dto.*; import com.zt.plat.module.bpm.enums.task.BpmProcessInstanceStatusEnum; import com.zt.plat.module.contractorder.api.dto.order.OrderAndPlanDataReqDTO; +import com.zt.plat.module.contractorder.api.dto.order.OriginalMaterialProcessingDetailDTO; import com.zt.plat.module.contractorder.api.vo.contract.ContractRespVO; +import com.zt.plat.module.contractorder.controller.admin.entrustorder.vo.EntrustOrderDetailRespVO; +import com.zt.plat.module.contractorder.controller.admin.originalmaterialprocessing.vo.OriginalMaterialProcessingDetailRespVO; import com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo.*; +import com.zt.plat.module.contractorder.controller.admin.salesorder.vo.SaleOrderDetailsRespVO; import com.zt.plat.module.contractorder.dal.dataobject.contract.ContractMainDO; import com.zt.plat.module.contractorder.dal.dataobject.contract.SystemRelativityDO; +import com.zt.plat.module.contractorder.dal.dataobject.entrustorder.EntrustOrderDetailDO; +import com.zt.plat.module.contractorder.dal.dataobject.originalmaterialprocessing.OriginalMaterialProcessingDetailDO; import com.zt.plat.module.contractorder.dal.dataobject.purchaseorder.PrchOrdDtlDO; import com.zt.plat.module.contractorder.dal.dataobject.purchaseorder.PurchaseOrderDO; import com.zt.plat.module.contractorder.dal.dataobject.salesorder.SalesOrderDO; +import com.zt.plat.module.contractorder.dal.dataobject.salesorder.SalesOrderDetailDO; import com.zt.plat.module.contractorder.dal.mysql.contract.ContractMainMapper; import com.zt.plat.module.contractorder.dal.mysql.contract.SystemRelativityMapper; +import com.zt.plat.module.contractorder.dal.mysql.entrustorder.EntrustOrderDetailMapper; +import com.zt.plat.module.contractorder.dal.mysql.originalmaterialprocessing.OriginalMaterialProcessingDetailMapper; import com.zt.plat.module.contractorder.dal.mysql.purchaseorder.PrchOrdDtlMapper; import com.zt.plat.module.contractorder.dal.mysql.purchaseorder.PurchaseOrderMapper; +import com.zt.plat.module.contractorder.dal.mysql.salesorder.SalesOrderDetailMapper; import com.zt.plat.module.contractorder.enums.ErpConstants; import com.zt.plat.module.contractorder.enums.OrderTypeEnum; import com.zt.plat.module.contractorder.enums.contract.DictEnum; @@ -114,6 +125,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService { @Resource private ContractMainMapper contractMainMapper; private static final Map VALID_RELATIONS = new HashMap<>(); + static { // 初始化合法的双向映射关系 VALID_RELATIONS.put("ENT", "ENTED_PUR"); @@ -363,7 +375,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService { item.setNet_price(detail.getInTaxUprc()); // 含税单价 -> 含税单价 item.setPrice_unit(detail.getPrcUnt() != null ? detail.getPrcUnt().intValue() : 1); // 价格单位 -> 价格单位 item.setTax_code(detail.getTaxNum()); // 税码 -> 税码 - // item.setGr_basediv(detail.getIsGrInv()); // 是否基于GR的发票校验 -> 基于GR的发票校验 + // item.setGr_basediv(detail.getIsGrInv()); // 是否基于GR的发票校验 -> 基于GR的发票校验 item.setUnlimited_dlv(detail.getIsUnlRcv()); // 是否允许无限制收货 -> 允许无限制过量交货 item.setBatch(detail.getBat()); // 批次 -> 批次 item.setAcctasscat(detail.getActsCtgr()); // 科目分配类别 -> 科目分配类别 @@ -410,8 +422,8 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService { erpOrderSaveReqVO.setItems(items); erpOrderSaveReqVO.setItex(itexes); } - String result ="ERP提交失败"; - result= erpOrderService.submitOrderToErp061(erpOrderSaveReqVO); + String result = "ERP提交失败"; + result = erpOrderService.submitOrderToErp061(erpOrderSaveReqVO); Long localOrderId = purchaseOrderWithDetailsVO.getPurchaseOrder().getId(); log.info("订单推送ERP请求完成，本地订单ID【{}】，ERP返回原始结果【{}】", localOrderId, result); @@ -924,24 +936,24 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService { @DeptDataPermissionIgnore @TenantIgnore public PageResult pageOrderNoPermission(PurchaseOrderPageReqVO pageReqVO) { - if (pageReqVO.getId() == null){ + if (pageReqVO.getId() == null) { throw exception(PURCHASE_ORDER_ID_IS_NULL); } PurchaseOrderDO purchaseOrderDO = purchaseOrderMapper.selectById(pageReqVO.getId()); - if (purchaseOrderDO == null){ - return PageResult.empty(); + if (purchaseOrderDO == null) { + return PageResult.empty(); } ContractMainDO contractMainDO = contractMainMapper.selectOne(new LambdaQueryWrapper() .eq(ContractMainDO::getSystemContractNumber, purchaseOrderDO.getContractNumber())); - if (contractMainDO == null || contractMainDO.getRelatedContractId() == null){ - return PageResult.empty(); + if (contractMainDO == null || contractMainDO.getRelatedContractId() == null) { + return PageResult.empty(); } ContractMainDO relatedContract = contractMainMapper.selectById(contractMainDO.getRelatedContractId()); - if (relatedContract == null){ - return PageResult.empty(); + if (relatedContract == null) { + return PageResult.empty(); } String splyBsnTp = VALID_RELATIONS.getOrDefault(purchaseOrderDO.getSplyBsnTp(), null); // 获取供应商业务类型 - if (splyBsnTp == null){ + if (splyBsnTp == null) { throw exception(PURCHASE_ORDER_ID_IS_EMPTY); } pageReqVO.setContractNumber(relatedContract.getSystemContractNumber()); @@ -959,14 +971,14 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService { //查询当前订单是否已经绑定订单 PurchaseOrderDO orderDO = purchaseOrderMapper.selectById(reqVO.getId()); PurchaseOrderDO boundOrder = purchaseOrderMapper.selectById(reqVO.getBoundId()); - if (boundOrder == null|| orderDO==null){ + if (boundOrder == null || orderDO == null) { throw exception(PURCHASE_ORDER_NOT_EXISTS); } //判断当前订单是否是来料加工销售订单（来料加工消费订单不允许绑定订单） if (OrderTypeEnum.ENTED_SALE.getCode().equals(orderDO.getSplyBsnTp())) { throw exception(PURCHASE_ORDER_NOT_ALLOW_BIND); } - if (orderDO.getRelatedOrderId()!=null){ + if (orderDO.getRelatedOrderId() != null) { //将已绑定的订单置空 PurchaseOrderDO relatedOrder = purchaseOrderMapper.selectById(orderDO.getRelatedOrderId()); relatedOrder.setRelatedOrderId(null); @@ -982,6 +994,51 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService { log.info("绑定订单操作完成，订单ID：{}", reqVO.getId()); } + @Override + public OrderRespVO getOrder(Long id) { + PurchaseOrderDO purchaseOrderDO = purchaseOrderMapper.selectById(id); + OrderRespVO bean = BeanUtils.toBean(purchaseOrderDO, OrderRespVO.class); + if (OrderTypeEnum.SALE.getCode().equals(bean.getSplyBsnTp())) { + // 销售订单 + List salesOrderDetailDOS = SpringUtils.getBean(SalesOrderDetailMapper.class).selectList( + new LambdaQueryWrapper() + .eq(SalesOrderDetailDO::getOrderId, purchaseOrderDO.getId()) + ); + bean.setSaleOrdDtlRespVOS(BeanUtils.toBean(salesOrderDetailDOS, SaleOrderDetailsRespVO.class)); + } else if (OrderTypeEnum.PUR.getCode().equals(bean.getSplyBsnTp())) { + // 采购订单 + List prchOrdDtlDOS = prchOrdDtlMapper.selectList( + new LambdaQueryWrapper() + .eq(PrchOrdDtlDO::getOrdId, purchaseOrderDO.getId()) + ); + bean.setPrchOrdDtlRespVOS(BeanUtils.toBean(prchOrdDtlDOS, PrchOrdDtlRespVO.class)); + } else if (OrderTypeEnum.ENT.getCode().equals(bean.getSplyBsnTp())) { + //委托加工订单 + List entrustOrderDetailDOS = SpringUtils.getBean(EntrustOrderDetailMapper.class).selectList( + new LambdaQueryWrapper() + .eq(EntrustOrderDetailDO::getOrderId, purchaseOrderDO.getId()) + ); + bean.setEntrustOrdDtlRespVOS(BeanUtils.toBean(entrustOrderDetailDOS, EntrustOrderDetailRespVO.class)); + + } else if (OrderTypeEnum.ENTED_SALE.getCode().equals(bean.getSplyBsnTp())) { + //来料加工销售订单 + List originalMaterialProcessingDetailDOS = SpringUtils.getBean(OriginalMaterialProcessingDetailMapper.class).selectList( + new LambdaQueryWrapper() + .eq(OriginalMaterialProcessingDetailDO::getOrderId, purchaseOrderDO.getId()) + ); + bean.setOriginalMaterialProcessingDetailRespVOS(BeanUtils.toBean(originalMaterialProcessingDetailDOS, OriginalMaterialProcessingDetailRespVO.class)); + + } else if (OrderTypeEnum.ENTED_PUR.getCode().equals(bean.getSplyBsnTp())) { + //来料加工采购订单 + List originalMaterialProcessingDetailDOS = SpringUtils.getBean(OriginalMaterialProcessingDetailMapper.class).selectList( + new LambdaQueryWrapper() + .eq(OriginalMaterialProcessingDetailDO::getOrderId, purchaseOrderDO.getId()) + ); + bean.setOriginalMaterialProcessingDetailRespVOS(BeanUtils.toBean(originalMaterialProcessingDetailDOS, OriginalMaterialProcessingDetailRespVO.class)); + } + return bean; + } + public WarehouseFactoryRespVO getBoundFactoryAndWarehouse(String factoryCode, String warehouseCode) { // 1. 查询主库信息，空值直接抛异常（精准异常信息）