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

委托加工和回收率管理优化

Browse Source
This commit is contained in:
潘荣晟
2026-02-03 17:40:22 +08:00
parent 6e72c30207
commit 0ecdb01a0b
12 changed files with 56 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,11 +41,11 @@ public interface OrderApi {
@PostMapping(PREFIX + "/get-salas-order-details-by-ids")
@Operation(summary = "通过销售订单明细id获取销售订单详情", description = "通过销售订单明细id获取销售订单详情")
CommonResult<List<SalesOrdDtlDTO>> getSalesOrderDetailsByOrderIds(@RequestBody List<Long> ids);
CommonResult<List<SalesOrdDtlDTO>> getSalesOrderDetailsByIds(@RequestBody List<Long> ids);
@GetMapping(PREFIX + "/get-salas-order-details-by-id")
@Operation(summary = "通过销售订单明细id获取销售订单详情", description = "通过销售订单明细id获取销售订单详情")
CommonResult<SalesOrdDtlDTO> getSalesOrderDetailsByOrderId(@RequestParam("id") Long id);
CommonResult<SalesOrdDtlDTO> getSalesOrderDetailsById(@RequestParam("id") Long id);
@PostMapping(PREFIX + "/query-order-plan-data")
@Operation(summary = "根据计划和订单的参数查询相关的订单", description = "根据计划和订单的参数查询相关的订单")

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

@@ -174,20 +174,20 @@ public class OrderApiImpl implements OrderApi {
}
@Override
public CommonResult<List<SalesOrdDtlDTO>> getSalesOrderDetailsByOrderIds(List<Long> ids) {
public CommonResult<List<SalesOrdDtlDTO>> getSalesOrderDetailsByIds(List<Long> ids) {
List<SalesOrderDetailDO> salesOrderDetailDOS = SpringUtil.getBean(SalesOrderDetailMapper.class).selectList(
new LambdaQueryWrapperX<SalesOrderDetailDO>()
.in(SalesOrderDetailDO::getOrderId, ids)
.in(SalesOrderDetailDO::getId, ids)
.eq(SalesOrderDetailDO::getIsEnable, '1')
);
return success(BeanUtils.toBean(salesOrderDetailDOS, SalesOrdDtlDTO.class));
}
@Override
public CommonResult<SalesOrdDtlDTO> getSalesOrderDetailsByOrderId(Long id) {
public CommonResult<SalesOrdDtlDTO> getSalesOrderDetailsById(Long id) {
SalesOrderDetailDO salesOrderDetailDOS = SpringUtil.getBean(SalesOrderDetailMapper.class).selectOne(
new LambdaQueryWrapperX<SalesOrderDetailDO>()
.eq(SalesOrderDetailDO::getOrderId, id)
.eq(SalesOrderDetailDO::getId, id)
.eq(SalesOrderDetailDO::getIsEnable, '1')
);
return success(BeanUtils.toBean(salesOrderDetailDOS, SalesOrdDtlDTO.class));

2
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderOrderPageReqVO.java
View File

@@ -122,5 +122,7 @@ public class EntrustOrderOrderPageReqVO extends PageParam {
@Schema(description = "采购组名称", example = "张三")
private String purchaseGroupName;
@Schema(description = "计量单位", example = "张三")
private String unit;
}

4
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderOrderRespVO.java
View File

@@ -166,4 +166,8 @@ public class EntrustOrderOrderRespVO {
@ExcelProperty("委托加工订单明细")
private List<EntrustOrderDetailRespVO> entrustOrderDetails;
@ExcelProperty("计量单位")
@Schema(description = "计量单位", example = "张三")
private String unit;
}

3
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderOrderSaveReqVO.java
View File

@@ -146,4 +146,7 @@ public class EntrustOrderOrderSaveReqVO {
@Schema(description = "委托加工订单明细")
private List<EntrustOrderDetailSaveReqVO> entrustOrderDetails;
@Schema(description = "计量单位", example = "张三")
private String unit;
}

9
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/SalesOrderController.java
View File

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

6
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderSaveReqVO.java
View File

@@ -142,12 +142,6 @@ public class SalesOrderSaveReqVO {
@Schema(description = "订单状态(字典:PRCH_ORD_STS)", example = "2")
private String status;
@Schema(description = "消费订单明细")
@ExcelProperty("消费订单明细")
private List<SalesOrderDetailSaveReqVO> salesOrderDetailSaveReqVOS;
@Schema(description = "流程实例编号")
@ExcelProperty("流程实例编号")
private String processInstanceId;

6
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/entrustorder/EntrustOrderOrderDO.java
View File

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

1
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/entrustorder/EntrustOrderOrderMapper.java
View File

@@ -59,6 +59,7 @@ public interface EntrustOrderOrderMapper extends BaseMapperX<EntrustOrderOrderDO
.eqIfPresent(EntrustOrderOrderDO::getCause, reqVO.getCause())
.eqIfPresent(EntrustOrderOrderDO::getStatus, reqVO.getStatus())
.likeIfPresent(EntrustOrderOrderDO::getPurchaseGroupName, reqVO.getPurchaseGroupName())
.likeIfPresent(EntrustOrderOrderDO::getUnit, reqVO.getUnit())
.orderByDesc(EntrustOrderOrderDO::getId));
}

15
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpErpMaterialCorrServiceImpl.java
View File

@@ -1,5 +1,7 @@
package com.zt.plat.module.erp.service.erp;
import com.zt.plat.framework.common.exception.ErrorCode;
import com.zt.plat.framework.common.pojo.CommonResult;
import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO;
import com.zt.plat.framework.common.util.object.BeanUtils;
import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
@@ -8,6 +10,8 @@ import com.zt.plat.module.erp.controller.admin.erp.vo.ErpMaterialCorrRspVO;
import com.zt.plat.module.erp.controller.admin.erp.vo.ErpMaterialCorrSaveReqVO;
import com.zt.plat.module.erp.dal.dataobject.erp.ErpMaterialCorrDO;
import com.zt.plat.module.erp.dal.mysql.erp.ErpErpMaterialCorrMapper;
import com.zt.plat.module.system.api.dept.DeptApi;
import com.zt.plat.module.system.api.dept.dto.DeptRespDTO;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
@@ -15,11 +19,15 @@ import org.springframework.validation.annotation.Validated;
import java.util.ArrayList;
import java.util.List;
import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception;
@Service
@Validated
public class ErpErpMaterialCorrServiceImpl implements ErpErpMaterialCorrService{
@Resource
private ErpErpMaterialCorrMapper erpErpMaterialCorrMapper;
@Resource
private DeptApi deptApi;
@Override
public List<ErpMaterialCorrRspVO> 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<DeptRespDTO> 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());
});

Some files were not shown because too many files have changed in this diff Show More