委托加工订单

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/entrustorder/ErrorCodeConstants.java

@@ -0,0 +1,17 @@
+package com.zt.plat.module.contractorder.enums.entrustorder;
+
+import com.zt.plat.framework.common.exception.ErrorCode;
+
+/**
+ * contract-order 错误码枚举类
+ *
+ * contract-order 系统，使用 1-xxx-xxx-xxx 段
+ *
+ * @author ZT
+ */
+public interface ErrorCodeConstants {
+
+    // ========== 合同模块 1-027-000-000 ==========
+    ErrorCode ENTRUST_ORDER_DETAIL_NOT_EXISTS = new ErrorCode(1_027_000_888, "委托加工订单明细不存在");
+    ErrorCode ENTRUST_ORDER_NOT_EXISTS = new ErrorCode(1_027_000_889, "委托加工订单不存在");
+}

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/ContractApiImpl.java

@@ -680,7 +680,7 @@ public class ContractApiImpl implements ContractApi {
 
     @Override
     public CommonResult<SalesOrdDtlDTO> getSalesOrderDetailById(Long id) {
-        SalesOrderDetailDO salesOrderDetailDO = SpringUtil.getBean(SalesOrderDetailMapper.class).selectOne(SalesOrderDetailDO::getId, id);
+        SalesOrderDetailDO salesOrderDetailDO = SpringUtil.getBean(SalesOrderDetailMapper.class).selectOne(SalesOrderDetailDO::getId, id,SalesOrderDetailDO::getIsEnable,1);
         SalesOrdDtlDTO salesOrdDtlDTO = BeanUtils.toBean(salesOrderDetailDO, SalesOrdDtlDTO.class);
         salesOrdDtlDTO.setUnit(salesOrderDetailDO.getUnt());
         return success(salesOrdDtlDTO);
@@ -688,19 +688,20 @@ public class ContractApiImpl implements ContractApi {
 
     @Override
     public CommonResult<List<SalesOrdDtlDTO>> getSalesOrderDetailByIds(List<Long> ids) {
-        List<SalesOrderDetailDO> salesOrderDetailDOS = SpringUtil.getBean(SalesOrderDetailMapper.class).selectList(SalesOrderDetailDO::getId, ids);
+        List<SalesOrderDetailDO> salesOrderDetailDOS = SpringUtil.getBean(SalesOrderDetailMapper.class).selectList(SalesOrderDetailDO::getId, ids,SalesOrderDetailDO::getIsEnable,1);
         return success(BeanUtils.toBean(salesOrderDetailDOS, SalesOrdDtlDTO.class));
     }
 
     @Override
     public CommonResult<PrchOrdDtlDTO> getPoOrderDetailById(Long id) {
-        PrchOrdDtlDO prchOrdDtlDO = SpringUtil.getBean(PrchOrdDtlMapper.class).selectById(id);
+        PrchOrdDtlDO prchOrdDtlDO = SpringUtil.getBean(PrchOrdDtlMapper.class).selectOne(PrchOrdDtlDO::getId,id,PrchOrdDtlDO::getIsEnb,1);
+
         return  success(BeanUtils.toBean(prchOrdDtlDO, PrchOrdDtlDTO.class));
     }
 
     @Override
     public CommonResult<List<PrchOrdDtlDTO>> getPoOrderDetailByIds(List<Long> ids) {
-        List<PrchOrdDtlDO> prchOrdDtlDOS = SpringUtil.getBean(PrchOrdDtlMapper.class).selectList(PrchOrdDtlDO::getId, ids);
+        List<PrchOrdDtlDO> prchOrdDtlDOS = SpringUtil.getBean(PrchOrdDtlMapper.class).selectList(PrchOrdDtlDO::getId, ids,PrchOrdDtlDO::getIsEnb,1);
         return  success(BeanUtils.toBean(prchOrdDtlDOS, PrchOrdDtlDTO.class));
     }
 }

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

@@ -174,13 +174,13 @@ public class OrderApiImpl implements OrderApi {
 
     @Override
     public CommonResult<List<SalesOrdDtlDTO>> getSalesOrderDetailsByOrderIds(List<Long> ids) {
-        List<SalesOrderDetailDO> salesOrderDetailDOS = SpringUtil.getBean(SalesOrderDetailMapper.class).selectList(SalesOrderDetailDO::getId, ids);
+        List<SalesOrderDetailDO> salesOrderDetailDOS = SpringUtil.getBean(SalesOrderDetailMapper.class).selectList(SalesOrderDetailDO::getId, ids, SalesOrderDetailDO::getIsEnable, 1);
         return success(BeanUtils.toBean(salesOrderDetailDOS, SalesOrdDtlDTO.class));
     }
 
     @Override
     public CommonResult<SalesOrdDtlDTO> getSalesOrderDetailsByOrderId(Long id) {
-        SalesOrderDetailDO salesOrderDetailDOS = SpringUtil.getBean(SalesOrderDetailMapper.class).selectOne(SalesOrderDetailDO::getOrderId, id);
+        SalesOrderDetailDO salesOrderDetailDOS = SpringUtil.getBean(SalesOrderDetailMapper.class).selectOne(SalesOrderDetailDO::getOrderId, id, SalesOrderDetailDO::getIsEnable, 1);
         return success(BeanUtils.toBean(salesOrderDetailDOS, SalesOrdDtlDTO.class));
     }
 
@@ -192,7 +192,7 @@ public class OrderApiImpl implements OrderApi {
     }
 
     private List<SalesOrderDO> getOrderByIds(List<Long> ids) {
-        return SpringUtil.getBean(SalesOrderMapper.class).selectByIds(ids); // 采购订单与销售订单的
+        return SpringUtil.getBean(SalesOrderMapper.class).selectList(SalesOrderDO::getId,ids); // 采购订单与销售订单的
     }
 
     private List<OrderDTO> getPoOrdByIds(List<Long> ids) {

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderDetailPageReqVO.java

@@ -0,0 +1,62 @@
+package com.zt.plat.module.contractorder.controller.admin.entrustorder.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.zt.plat.framework.common.pojo.PageParam;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 委托加工订单明细分页 Request VO")
+@Data
+public class EntrustOrderDetailPageReqVO extends PageParam {
+
+    @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 materialName;
+
+    @Schema(description = "物料编码")
+    private String materialNumber;
+
+    @Schema(description = "计量单位")
+    private String uom;
+
+    @Schema(description = "暂估数量")
+    private BigDecimal forecastQuantity;
+
+    @Schema(description = "含税单价", example = "24704")
+    private BigDecimal inTaxUnitPrice;
+
+    @Schema(description = "交货起始日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] deliveryCargoBeginDate;
+
+    @Schema(description = "交货截止日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] deliveryCargoEndDate;
+
+    @Schema(description = "是否启用")
+    private Boolean isEnable;
+
+    @Schema(description = "短文本")
+    private String shortText;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderDetailRespVO.java

@@ -0,0 +1,76 @@
+package com.zt.plat.module.contractorder.controller.admin.entrustorder.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 委托加工订单明细 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class EntrustOrderDetailRespVO {
+
+    @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "8625")
+    @ExcelProperty("主键ID")
+    private Long id;
+
+    @Schema(description = "收货工厂名称", example = "赵六")
+    @ExcelProperty("收货工厂名称")
+    private String receiveFactoryName;
+
+    @Schema(description = "收货工厂编码")
+    @ExcelProperty("收货工厂编码")
+    private String receiveFactoryNumber;
+
+    @Schema(description = "收货库位名称", example = "张三")
+    @ExcelProperty("收货库位名称")
+    private String receiveWarehouseName;
+
+    @Schema(description = "收货库位编码")
+    @ExcelProperty("收货库位编码")
+    private String receiveWarehouseNumber;
+
+    @Schema(description = "物料名称", example = "赵六")
+    @ExcelProperty("物料名称")
+    private String materialName;
+
+    @Schema(description = "物料编码")
+    @ExcelProperty("物料编码")
+    private String materialNumber;
+
+    @Schema(description = "计量单位")
+    @ExcelProperty("计量单位")
+    private String uom;
+
+    @Schema(description = "暂估数量")
+    @ExcelProperty("暂估数量")
+    private BigDecimal forecastQuantity;
+
+    @Schema(description = "含税单价", example = "24704")
+    @ExcelProperty("含税单价")
+    private BigDecimal inTaxUnitPrice;
+
+    @Schema(description = "交货起始日期")
+    @ExcelProperty("交货起始日期")
+    private LocalDateTime deliveryCargoBeginDate;
+
+    @Schema(description = "交货截止日期")
+    @ExcelProperty("交货截止日期")
+    private LocalDateTime deliveryCargoEndDate;
+
+    @Schema(description = "是否启用")
+    @ExcelProperty("是否启用")
+    private Boolean isEnable;
+
+    @Schema(description = "短文本")
+    @ExcelProperty("短文本")
+    private String shortText;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderDetailSaveReqVO.java

@@ -0,0 +1,57 @@
+package com.zt.plat.module.contractorder.controller.admin.entrustorder.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import jakarta.validation.constraints.*;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 委托加工订单明细新增/修改 Request VO")
+@Data
+public class EntrustOrderDetailSaveReqVO {
+
+    @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "8625")
+    private Long id;
+
+    @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 materialName;
+
+    @Schema(description = "物料编码")
+    private String materialNumber;
+
+    @Schema(description = "计量单位")
+    private String uom;
+
+    @Schema(description = "暂估数量")
+    private BigDecimal forecastQuantity;
+
+    @Schema(description = "含税单价", example = "24704")
+    private BigDecimal inTaxUnitPrice;
+
+    @Schema(description = "交货起始日期")
+    private LocalDateTime deliveryCargoBeginDate;
+
+    @Schema(description = "交货截止日期")
+    private LocalDateTime deliveryCargoEndDate;
+
+    @Schema(description = "是否启用")
+    private Boolean isEnable;
+
+    @Schema(description = "短文本")
+    private String shortText;
+
+}