From 0ecdb01a0b94e68636a5a0bef9dea2ebdbbefc44 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: Tue, 3 Feb 2026 17:40:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A7=94=E6=89=98=E5=8A=A0=E5=B7=A5=E5=92=8C?= =?UTF-8?q?=E5=9B=9E=E6=94=B6=E7=8E=87=E7=AE=A1=E7=90=86=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/contractorder/api/OrderApi.java | 4 ++-- .../contractorder/api/OrderApiImpl.java | 8 ++++---- .../vo/EntrustOrderOrderPageReqVO.java | 2 ++ .../vo/EntrustOrderOrderRespVO.java | 4 ++++ .../vo/EntrustOrderOrderSaveReqVO.java | 3 +++ .../salesorder/SalesOrderController.java | 9 +++++++++ .../salesorder/vo/SalesOrderSaveReqVO.java | 6 ------ .../entrustorder/EntrustOrderOrderDO.java | 6 ++++++ .../entrustorder/EntrustOrderOrderMapper.java | 1 + .../erp/ErpErpMaterialCorrServiceImpl.java | 15 +++++++++++++- .../service/erp/ErpWarehouseServiceImpl.java | 2 +- .../resources/mapper/ErpWarehouseMapper.xml | 20 +++++++++---------- 12 files changed, 56 insertions(+), 24 deletions(-) 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 4cce3700..012dfd1e 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 @@ -41,11 +41,11 @@ public interface OrderApi { @PostMapping(PREFIX + "/get-salas-order-details-by-ids") @Operation(summary = "通过销售订单明细id获取销售订单详情", description = "通过销售订单明细id获取销售订单详情") - CommonResult> getSalesOrderDetailsByOrderIds(@RequestBody List ids); + CommonResult> getSalesOrderDetailsByIds(@RequestBody List ids); @GetMapping(PREFIX + "/get-salas-order-details-by-id") @Operation(summary = "通过销售订单明细id获取销售订单详情", description = "通过销售订单明细id获取销售订单详情") - CommonResult getSalesOrderDetailsByOrderId(@RequestParam("id") Long id); + CommonResult getSalesOrderDetailsById(@RequestParam("id") Long id); @PostMapping(PREFIX + "/query-order-plan-data") @Operation(summary = "根据计划和订单的参数查询相关的订单", description = "根据计划和订单的参数查询相关的订单") 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 5a2ce821..1822b802 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 @@ -174,20 +174,20 @@ public class OrderApiImpl implements OrderApi { } @Override - public CommonResult> getSalesOrderDetailsByOrderIds(List ids) { + public CommonResult> getSalesOrderDetailsByIds(List ids) { List salesOrderDetailDOS = SpringUtil.getBean(SalesOrderDetailMapper.class).selectList( new LambdaQueryWrapperX() - .in(SalesOrderDetailDO::getOrderId, ids) + .in(SalesOrderDetailDO::getId, ids) .eq(SalesOrderDetailDO::getIsEnable, '1') ); return success(BeanUtils.toBean(salesOrderDetailDOS, SalesOrdDtlDTO.class)); } @Override - public CommonResult getSalesOrderDetailsByOrderId(Long id) { + public CommonResult getSalesOrderDetailsById(Long id) { SalesOrderDetailDO salesOrderDetailDOS = SpringUtil.getBean(SalesOrderDetailMapper.class).selectOne( new LambdaQueryWrapperX() - .eq(SalesOrderDetailDO::getOrderId, id) + .eq(SalesOrderDetailDO::getId, id) .eq(SalesOrderDetailDO::getIsEnable, '1') ); return success(BeanUtils.toBean(salesOrderDetailDOS, SalesOrdDtlDTO.class)); 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 f1323d01..48cb4c62 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 @@ -122,5 +122,7 @@ public class EntrustOrderOrderPageReqVO extends PageParam { @Schema(description = "采购组名称", example = "张三") private String purchaseGroupName; + @Schema(description = "计量单位", example = "张三") + private String unit; } \ 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 d6726c67..713f364c 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 @@ -166,4 +166,8 @@ public class EntrustOrderOrderRespVO { @ExcelProperty("委托加工订单明细") private List entrustOrderDetails; + @ExcelProperty("计量单位") + @Schema(description = "计量单位", example = "张三") + private String unit; + } \ 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 5821ad76..f5c5f4fa 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 @@ -146,4 +146,7 @@ public class EntrustOrderOrderSaveReqVO { @Schema(description = "委托加工订单明细") private List entrustOrderDetails; + @Schema(description = "计量单位", example = "张三") + private String unit; + } \ 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/salesorder/SalesOrderController.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/SalesOrderController.java index 3c46be12..059ba315 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/SalesOrderController.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/SalesOrderController.java @@ -11,6 +11,7 @@ import com.zt.plat.framework.common.util.object.BeanUtils; import com.zt.plat.framework.excel.core.util.ExcelUtils; import com.zt.plat.module.contractorder.api.ContractApi; import com.zt.plat.module.contractorder.api.ContractApiImpl; +import com.zt.plat.module.contractorder.api.OrderApi; import com.zt.plat.module.contractorder.api.dto.order.PurchaseOrderWithDetailsDTO; import com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo.*; import com.zt.plat.module.contractorder.controller.admin.salesorder.vo.SalesOrderPageReqVO; @@ -52,6 +53,9 @@ public class SalesOrderController implements BusinessControllerMarker { @Resource private SalesOrderService salesOrderService; + @Resource + private OrderApi orderApi; + @PostMapping("/create") @Operation(summary = "创建销售订单") @@ -205,4 +209,9 @@ public class SalesOrderController implements BusinessControllerMarker { salesOrderService.updateOrderStatusByIdOrOrderNo(req); return success(true); } + //feign测试 + @GetMapping("/get-sales-order-details-by-order-id") + public CommonResult getSalesOrderDetailsByOrderId(@RequestParam("orderId") Long orderId) { + return success(orderApi.getSalesOrderDetailsById(orderId)); + } } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderSaveReqVO.java index d8186c0c..ba2c6fc6 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderSaveReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderSaveReqVO.java @@ -142,12 +142,6 @@ public class SalesOrderSaveReqVO { @Schema(description = "订单状态(字典:PRCH_ORD_STS)", example = "2") private String status; - - @Schema(description = "消费订单明细") - @ExcelProperty("消费订单明细") - private List salesOrderDetailSaveReqVOS; - - @Schema(description = "流程实例编号") @ExcelProperty("流程实例编号") private String processInstanceId; 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 0747c820..e0ae7594 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 @@ -1,5 +1,6 @@ package com.zt.plat.module.contractorder.dal.dataobject.entrustorder; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; import java.time.LocalDateTime; @@ -213,4 +214,9 @@ public class EntrustOrderOrderDO extends BusinessBaseDO { */ @TableField("IS_PUSH") private int isPush; + /** + * 计量单位 + */ + @TableField("UNT") + private String unit; } \ 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/mysql/entrustorder/EntrustOrderOrderMapper.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/entrustorder/EntrustOrderOrderMapper.java index 574bcdea..4f49bb3c 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/entrustorder/EntrustOrderOrderMapper.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/entrustorder/EntrustOrderOrderMapper.java @@ -59,6 +59,7 @@ public interface EntrustOrderOrderMapper extends BaseMapperX create(ErpMaterialCorrSaveReqVO reqVO) { @@ -29,12 +37,17 @@ public class ErpErpMaterialCorrServiceImpl implements ErpErpMaterialCorrService{ if (erpErpMaterialCorrMapper.selectOne(ErpMaterialCorrDO::getMaterialParentId,reqVO.getMaterialParentId(), ErpMaterialCorrDO::getMaterialId,materials.getMaterialId()) != null) { return; } + CommonResult dept = deptApi.getDept(reqVO.getDeptId()); + DeptRespDTO data = dept.getData(); + if (data==null) { + throw exception(new ErrorCode(1027004000, "部门不存在")); + } erpMaterialCorrDOS.add(ErpMaterialCorrDO.builder() .materialParentId(reqVO.getMaterialParentId()) .materialParentCode(reqVO.getMaterialParentCode()) .materialId(materials.getMaterialId()) .deptId(reqVO.getDeptId()) - .companyCode(reqVO.getCompanyCode()) + .companyCode(data.getCode()) .materialCode(materials.getMaterialCode()) .build()); }); diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpWarehouseServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpWarehouseServiceImpl.java index 2c5eb7af..f815d0b7 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpWarehouseServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpWarehouseServiceImpl.java @@ -192,7 +192,7 @@ public PageResult getErpWarehousePageDistinctByFactory(ErpWareho @Override public PageResult getErpWarehousePage(ErpWarehousePageReqVO pageReqVO) { - return new PageResult<>(erpWarehouseMapper.selectWarehouseByDynamicParams(pageReqVO, pageReqVO.getPageNo(), pageReqVO.getPageSize()), erpWarehouseMapper.selectWarehouseByDynamicParamsCount(pageReqVO)); + return new PageResult<>(erpWarehouseMapper.selectWarehouseByDynamicParams(pageReqVO, pageReqVO.getPageNo()-1, pageReqVO.getPageSize()), erpWarehouseMapper.selectWarehouseByDynamicParamsCount(pageReqVO)); // PageResult erpWarehouseRespVOPageResult = BeanUtils.toBean(erpWarehouseMapper.selectPage(pageReqVO), ErpWarehouseRespVO.class); // if (erpWarehouseRespVOPageResult.getList() == null) { // return erpWarehouseRespVOPageResult; diff --git a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpWarehouseMapper.xml b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpWarehouseMapper.xml index 2c0d4937..09e31bba 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpWarehouseMapper.xml +++ b/zt-module-erp/zt-module-erp-server/src/main/resources/mapper/ErpWarehouseMapper.xml @@ -90,19 +90,19 @@ AND sef.DELETED = 0 AND sew.DELETED = 0 - AND sef.CPN_ID = #{paramReqVO.companyIdCustom} + AND sef.CPN_ID LIKE CONCAT('%', #{paramReqVO.companyIdCustom}, '%') - AND sef.TP = #{paramReqVO.type} + AND sef.TP LIKE CONCAT('%', #{paramReqVO.type}, '%') - AND sew.NUM = #{paramReqVO.number} + AND sew.NUM LIKE CONCAT('%', #{paramReqVO.number}, '%') - AND sef.NUM = #{paramReqVO.factoryNumber} + AND sef.NUM LIKE CONCAT('%', #{paramReqVO.factoryNumber}, '%') - AND sef.NAME = #{paramReqVO.factoryName} + AND sef.NAME LIKE CONCAT('%', #{paramReqVO.factoryName}, '%') ORDER BY sew.CREATE_TIME DESC @@ -120,19 +120,19 @@ AND sef.DELETED = 0 AND sew.DELETED = 0 - AND sef.CPN_ID = #{paramReqVO.companyIdCustom} + AND sef.CPN_ID LIKE CONCAT('%', #{paramReqVO.companyIdCustom}, '%') - AND sef.TP = #{paramReqVO.type} + AND sef.TP LIKE CONCAT('%', #{paramReqVO.type}, '%') - AND sew.NUM = #{paramReqVO.number} + AND sew.NUM LIKE CONCAT('%', #{paramReqVO.number}, '%') - AND sef.NUM = #{paramReqVO.factoryNumber} + AND sef.NUM LIKE CONCAT('%', #{paramReqVO.factoryNumber}, '%') - AND sef.NAME = #{paramReqVO.factoryName} + AND sef.NAME LIKE CONCAT('%', #{paramReqVO.factoryName}, '%')