From 72f38c50754d8fb11e7da4a7e1d9d17e3f9a1efd 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: Fri, 27 Feb 2026 14:42:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=A5=E6=96=99=E5=8A=A0=E5=B7=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...inalMaterialProcessingDetailPageReqVO.java | 2 + ...riginalMaterialProcessingDetailRespVO.java | 5 + ...inalMaterialProcessingDetailSaveReqVO.java | 2 + .../OriginalMaterialProcessingPageReqVO.java | 5 +- .../vo/OriginalMaterialProcessingRespVO.java | 103 ++++++++++++------ .../OriginalMaterialProcessingSaveReqVO.java | 2 + .../OriginalMaterialProcessingDetailDO.java | 3 + ...inalMaterialProcessingServiceImplImpl.java | 23 +++- 8 files changed, 110 insertions(+), 35 deletions(-) diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/vo/OriginalMaterialProcessingDetailPageReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/vo/OriginalMaterialProcessingDetailPageReqVO.java index 7fb8f2af..4a80e357 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/vo/OriginalMaterialProcessingDetailPageReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/vo/OriginalMaterialProcessingDetailPageReqVO.java @@ -126,5 +126,7 @@ public class OriginalMaterialProcessingDetailPageReqVO extends PageParam { @Schema(description = "税率") private BigDecimal taxRte; + @Schema(description = "价格条件明细") + private String priceConditionDetail; } \ 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/originalmaterialprocessing/vo/OriginalMaterialProcessingDetailRespVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/vo/OriginalMaterialProcessingDetailRespVO.java index 9db35b18..746ed4bf 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/vo/OriginalMaterialProcessingDetailRespVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/vo/OriginalMaterialProcessingDetailRespVO.java @@ -156,5 +156,10 @@ public class OriginalMaterialProcessingDetailRespVO { private String metalAcctasscatGroup; @Schema(description = "税率") + @ExcelProperty("税率") private BigDecimal taxRte; + + @Schema(description = "价格条件明细") + @ExcelProperty("价格条件明细") + private String priceConditionDetail; } \ 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/originalmaterialprocessing/vo/OriginalMaterialProcessingDetailSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/vo/OriginalMaterialProcessingDetailSaveReqVO.java index 46814bf4..8eda9d77 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/vo/OriginalMaterialProcessingDetailSaveReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/vo/OriginalMaterialProcessingDetailSaveReqVO.java @@ -124,4 +124,6 @@ public class OriginalMaterialProcessingDetailSaveReqVO { @Schema(description = "税率") private BigDecimal taxRte; + @Schema(description = "价格条件明细") + private String priceConditionDetail; } \ 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/originalmaterialprocessing/vo/OriginalMaterialProcessingPageReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/vo/OriginalMaterialProcessingPageReqVO.java index 135ece73..81fde96a 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/vo/OriginalMaterialProcessingPageReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/vo/OriginalMaterialProcessingPageReqVO.java @@ -19,9 +19,10 @@ public class OriginalMaterialProcessingPageReqVO extends PageParam { @Schema(description = "订单号") private String systemOrderNumber; - @Schema(description = "公司编码;推送ERP（必须）") + @Schema(description = "公司名称", example = "芋艿") private String cpName; - + @Schema(description = "公司编码;推送ERP（必须）") + private String cpNum; @Schema(description = "客商编码;推送ERP（必须）") private String supplierNumber; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/vo/OriginalMaterialProcessingRespVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/vo/OriginalMaterialProcessingRespVO.java index 97c9e223..07afb9bd 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/vo/OriginalMaterialProcessingRespVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/vo/OriginalMaterialProcessingRespVO.java @@ -1,6 +1,7 @@ package com.zt.plat.module.contractorder.controller.admin.originalmaterialprocessing.vo; import com.alibaba.excel.annotation.ExcelProperty; +import com.zt.plat.module.contractorder.controller.admin.salesorder.vo.SalesOrderDetailRespVO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -26,7 +27,7 @@ public class OriginalMaterialProcessingRespVO { @Schema(description = "公司编码;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("公司编码;推送ERP（必须）") - private String cpName; + private String cpNum; @Schema(description = "客商编码;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("客商编码;推送ERP（必须）") @@ -44,12 +45,9 @@ public class OriginalMaterialProcessingRespVO { @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("收货工厂名称") + @Schema(description = "发货工厂名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") + @ExcelProperty("发货工厂名称") private String receiveFactoryName; @Schema(description = "收货工厂编码;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED) @@ -64,6 +62,9 @@ public class OriginalMaterialProcessingRespVO { @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; @@ -159,39 +160,79 @@ public class OriginalMaterialProcessingRespVO { @Schema(description = "采购组名称", example = "张三") @ExcelProperty("采购组名称") private String purchaseGroupName; - @Schema(description = "订单明细") - private List details; - @ExcelProperty("业务类型(字典：SPLY_BSN_TP)") - @Schema(description = "订单类型，(字典：SPLY_BSN_TP)") + @Schema(description = "销售订单明细") + @ExcelProperty("销售订单明细") + private List salesOrderDetailRespVOS; + + @Schema(description = "物料类型(字典:MTRL_TP)", example = "2") + @ExcelProperty("物料类型(字典:MTRL_TP)") + private String mtrlTp; + + @Schema(description = "订单分类", example = "2") + @ExcelProperty("订单分类") private String splyBsnTp; - @Schema(description = "相关订单ID") - @ExcelProperty("相关订单ID") - private Long relatedOrderId; - //绑定的来料采购订单 - @Schema(description = "绑定的来料采购订单") - private OriginalMaterialProcessingRespVO relatedOrder; - @Schema(description = "销售组织代码") - @ExcelProperty("销售组织代码") - private String saleOrgzCd; - @Schema(description = "付款方名称") - @ExcelProperty("付款方名称") - private String payerName; + @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 = "销售组织名称") @ExcelProperty("销售组织名称") private String saleOrgzName; - @Schema(description = "分销聚道编码") - @ExcelProperty("分销聚道编码") - private String saleAcsCdg; - @Schema(description = "产品组编码") - @ExcelProperty("产品组编码") - private String pdtGrpCdg; - @Schema(description = "产品组名称") - @ExcelProperty("产品组名称") - private String pdtGrpName; + @Schema(description = "销售组织编码") + @ExcelProperty("销售组织编码") + private String saleOrgzCd; @Schema(description = "分销聚道名称") @ExcelProperty("分销聚道名称") private String saleAcsName; + @Schema(description = "分销聚道编码") + @ExcelProperty("分销聚道编码") + private String saleAcsCdg; + + @Schema(description = "产品组名") + @ExcelProperty("产品组名") + private String pdtGrpName; + @Schema(description = "产品组编码") + @ExcelProperty("产品组编码") + private String pdtGrpCdg; + @Schema(description = "付款方名称") + @ExcelProperty("付款方名称") + private String payerName; + @Schema(description = "付款方编码") + @ExcelProperty("付款方编码") + private String payerNum; + @Schema(description = "货权转移类型(字典：ASY_MTNG_TP)") + @ExcelProperty("货权转移类型(字典：ASY_MTNG_TP)") + private String meteringType; + + @Schema(description = "erp失败原因") + private String issueCause; + + @Schema(description = "相关订单id") + private Long relatedOrderId; + @Schema(description = "订单明细") + private List details; + //绑定的来料采购订单 + @Schema(description = "绑定的来料采购订单") + private OriginalMaterialProcessingRespVO relatedOrder; + + + + } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/vo/OriginalMaterialProcessingSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/vo/OriginalMaterialProcessingSaveReqVO.java index 28e37cd0..7229a717 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/vo/OriginalMaterialProcessingSaveReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/vo/OriginalMaterialProcessingSaveReqVO.java @@ -170,6 +170,8 @@ public class OriginalMaterialProcessingSaveReqVO { private String saleOrgzCd; @Schema(description = "付款方名称") private String payerName; + @Schema(description = "付款方编码") + private String payerNum; @Schema(description = "销售组织名称") private String saleOrgzName; @Schema(description = "分销聚道编码") diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/originalmaterialprocessing/OriginalMaterialProcessingDetailDO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/originalmaterialprocessing/OriginalMaterialProcessingDetailDO.java index f2bdac09..fff750e4 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/originalmaterialprocessing/OriginalMaterialProcessingDetailDO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/originalmaterialprocessing/OriginalMaterialProcessingDetailDO.java @@ -213,4 +213,7 @@ public class OriginalMaterialProcessingDetailDO extends BusinessBaseDO { */ @TableField("TAX_RTE") private BigDecimal taxRte; + + @TableField("PRC_CND_DTL") + private String priceConditionDetail; } \ 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/originalmaterialprocessing/OriginalMaterialProcessingServiceImplImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/originalmaterialprocessing/OriginalMaterialProcessingServiceImplImpl.java index 1a175c8d..c589c886 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/originalmaterialprocessing/OriginalMaterialProcessingServiceImplImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/originalmaterialprocessing/OriginalMaterialProcessingServiceImplImpl.java @@ -1,6 +1,8 @@ package com.zt.plat.module.contractorder.service.originalmaterialprocessing; import cn.hutool.core.collection.CollUtil; +import com.alibaba.fastjson2.JSONArray; +import com.alibaba.fastjson2.JSONException; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -127,7 +129,7 @@ public class OriginalMaterialProcessingServiceImplImpl implements OriginalMateri } private String generateOrderNumber(String materialType) { - return sequenceApi.getNextSequence("ENTRUST_ORDER_NUMBER", null, null).getData(); + return sequenceApi.getNextSequence("OEM_CMT_ORDER_NO", null, null).getData(); } @@ -455,6 +457,7 @@ public class OriginalMaterialProcessingServiceImplImpl implements OriginalMateri // head.setTaxclass(1); erpSalesOrderSaveReqVO.setHead(head); List items = new ArrayList<>(); + List conds = new ArrayList<>(); originalMaterialProcessingDetailDOS.forEach(detail -> { ErpSalesOrderSaveReqVO.Item item = new ErpSalesOrderSaveReqVO.Item(); item.setItem_categ(String.valueOf(detail.getLineNumber())); @@ -469,7 +472,23 @@ public class OriginalMaterialProcessingServiceImplImpl implements OriginalMateri item.setShip_point(detail.getShippingPlace()); // 装运地点 item.setAcct_assgt(detail.getMetalAcctasscatGroup());//todo 物料科目分配组 items.add(item); + + //conds + String priceConditionDetail = detail.getPriceConditionDetail(); + if (priceConditionDetail == null || priceConditionDetail.trim().isEmpty()) { + return; // 空字符串直接跳过 + } + try { + // 解析 JSON 数组，捕获格式错误 + List strList = JSONArray.parseArray(priceConditionDetail, String.class); + // List jsonArrays = JSONArray.parseArray(priceConditionDetail, JSONArray.class); + conds.addAll(strList); + } catch (JSONException e) { + // 处理解析失败（例如打日志、忽略错误数据等） + log.error("解析价格条件详情失败，内容：{}", priceConditionDetail, e); + } }); + erpSalesOrderSaveReqVO.setConds(conds); } @Override @@ -483,7 +502,7 @@ public class OriginalMaterialProcessingServiceImplImpl implements OriginalMateri throw exception(ORIGINAL_MATERIAL_PROCESSING_DO_NOT_EXISTS); } - if (originalMaterialProcessingDO.getOrderSAPNumber()!=null) { + if (originalMaterialProcessingDO.getOrderSAPNumber() != null) { throw exception(ORDER_ALREADY_SUBMIT); }