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

新增合同收发货规则

Browse Source
This commit is contained in:
潘荣晟
2026-01-07 17:10:10 +08:00
parent 4b6bd9cec5
commit c32d27ad3f
18 changed files with 638 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/WarehouseFactoryController.java Normal file
View File

File diff suppressed because it is too large Load Diff

5
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpWarehousePageReqVO.java
View File

@@ -22,6 +22,9 @@ public class ErpWarehousePageReqVO extends PageParam {
@Schema(description = "类型")
private String type;
@Schema(description = "公司名称")
private String companyNameCustom;
@Schema(description = "公司编号")
private String companyIdCustom;
}

5
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpWarehouseRespVO.java
View File

@@ -42,4 +42,9 @@ public class ErpWarehouseRespVO {
@Schema(description = "是否启用")
private String isEnable;
@Schema(description = "公司名称")
private String companyNameCustom;
@Schema(description = "公司编号")
private String companyIdCustom;
}

4
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/ErpWarehouseSaveReqVO.java
View File

@@ -33,5 +33,9 @@ public class ErpWarehouseSaveReqVO {
@Schema(description = "是否启用")
private String isEnable;
@Schema(description = "公司名称")
private String companyNameCustom;
@Schema(description = "公司编号")
private String companyIdCustom;
}

56
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/WarehouseFactoryPageReqVO.java Normal file
View File

@@ -0,0 +1,56 @@
package com.zt.plat.module.erp.controller.admin.erp.vo;
import com.zt.plat.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
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 WarehouseFactoryPageReqVO extends PageParam {
@Schema(description = "公司名称")
private String companyNameCustom;
@Schema(description = "公司编码")
private String companyIdCustom;
@Schema(description = "操作类型", example = "2")
private String operationType;
@Schema(description = "业务类型", example = "2")
private String mMSIType;
@Schema(description = "erp源工厂名称", example = "赵六")
private String erpSourceFactoryName;
@Schema(description = "erp源工厂编码")
private String erpSourceFactoryNumber;
@Schema(description = "erp源库位名称", example = "赵六")
private String erpSourceWarehouseName;
@Schema(description = "erp源库位编码")
private String erpSourceWarehouseNumber;
@Schema(description = "erp目标工厂名称", example = "赵六")
private String erpTargetFactoryName;
@Schema(description = "erp目标工厂编码")
private String erpTargetFactoryNumber;
@Schema(description = "erp目标库位名称", example = "ZT")
private String erpTargetWarehouseName;
@Schema(description = "erp目标库位编码")
private String erpTargetWarehouseNumber;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
}

71
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/WarehouseFactoryRespVO.java Normal file
View File

@@ -0,0 +1,71 @@
package com.zt.plat.module.erp.controller.admin.erp.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@Schema(description = "管理后台 - 仓库工厂关系 Response VO")
@Data
@ExcelIgnoreUnannotated
public class WarehouseFactoryRespVO {
@Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "5015")
@ExcelProperty("主键ID")
private Long id;
@Schema(description = "公司名称")
@ExcelProperty("公司名称")
private String companyNameCustom;
@Schema(description = "公司编码")
@ExcelProperty("公司编码")
private String companyIdCustom;
@Schema(description = "操作类型", example = "2")
@ExcelProperty("操作类型")
private String operationType;
@Schema(description = "业务类型", example = "2")
@ExcelProperty("业务类型")
private String mMSIType;
@Schema(description = "erp源工厂名称", example = "赵六")
@ExcelProperty("erp源工厂名称")
private String erpSourceFactoryName;
@Schema(description = "erp源工厂编码")
@ExcelProperty("erp源工厂编码")
private String erpSourceFactoryNumber;
@Schema(description = "erp源库位名称", example = "赵六")
@ExcelProperty("erp源库位名称")
private String erpSourceWarehouseName;
@Schema(description = "erp源库位编码")
@ExcelProperty("erp源库位编码")
private String erpSourceWarehouseNumber;
@Schema(description = "erp目标工厂名称", example = "赵六")
@ExcelProperty("erp目标工厂名称")
private String erpTargetFactoryName;
@Schema(description = "erp目标工厂编码")
@ExcelProperty("erp目标工厂编码")
private String erpTargetFactoryNumber;
@Schema(description = "erp目标库位名称", example = "ZT")
@ExcelProperty("erp目标库位名称")
private String erpTargetWarehouseName;
@Schema(description = "erp目标库位编码")
@ExcelProperty("erp目标库位编码")
private String erpTargetWarehouseNumber;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建时间")
private LocalDateTime createTime;
}

49
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/controller/admin/erp/vo/WarehouseFactorySaveReqVO.java Normal file
View File

@@ -0,0 +1,49 @@
package com.zt.plat.module.erp.controller.admin.erp.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Schema(description = "管理后台 - 仓库工厂关系新增/修改 Request VO")
@Data
public class WarehouseFactorySaveReqVO {
@Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "5015")
private Long id;
@Schema(description = "公司名称")
private String companyNameCustom;
@Schema(description = "公司编码")
private String companyIdCustom;
@Schema(description = "操作类型", example = "2")
private String operationType;
@Schema(description = "业务类型", example = "2")
private String mMSIType;
@Schema(description = "erp源工厂名称", example = "赵六")
private String erpSourceFactoryName;
@Schema(description = "erp源工厂编码")
private String erpSourceFactoryNumber;
@Schema(description = "erp源库位名称", example = "赵六")
private String erpSourceWarehouseName;
@Schema(description = "erp源库位编码")
private String erpSourceWarehouseNumber;
@Schema(description = "erp目标工厂名称", example = "赵六")
private String erpTargetFactoryName;
@Schema(description = "erp目标工厂编码")
private String erpTargetFactoryNumber;
@Schema(description = "erp目标库位名称", example = "ZT")
private String erpTargetWarehouseName;
@Schema(description = "erp目标库位编码")
private String erpTargetWarehouseNumber;
}

10
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpWarehouseDO.java
View File

@@ -70,5 +70,15 @@ public class ErpWarehouseDO extends BusinessBaseDO {
*/
@TableField("IS_ENB")
private String isEnable;
/**
* 公司编号
*/
@TableField("CPN_ID_CST")
private String companyIdCustom;
/**
* 公司名称
*/
@TableField("CPN_NAME_CST")
private String companyNameCustom;
}

93
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/WarehouseFactoryDO.java Normal file
View File

@@ -0,0 +1,93 @@
package com.zt.plat.module.erp.dal.dataobject.erp;
import com.baomidou.mybatisplus.annotation.*;
import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO;
import lombok.*;
/**
* 仓库工厂关系 DO
*
* @author 后台管理-1
*/
@TableName("bse_wrh_fact")
@KeySequence("bse_wrh_fact_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@Builder
@NoArgsConstructor
@AllArgsConstructor
/**
* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO
*/
public class WarehouseFactoryDO extends BusinessBaseDO {
/**
* 主键ID
*/
@TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
* 公司名称
*/
@TableField("CPN_NAME_CST")
private String companyNameCustom;
/**
* 公司编码
*/
@TableField("CPN_ID_CST")
private String companyIdCustom;
/**
* 操作类型
*/
@TableField("OPTN_TP")
private String operationType;
/**
* 业务类型
*/
@TableField("MMSI_TP")
private String mMSIType;
/**
* erp源工厂名称
*/
@TableField("ERP_SRC_FACT_NAME")
private String erpSourceFactoryName;
/**
* erp源工厂编码
*/
@TableField("ERP_SRC_FACT_NUM")
private String erpSourceFactoryNumber;
/**
* erp源库位名称
*/
@TableField("ERP_SRC_WRH_NAME")
private String erpSourceWarehouseName;
/**
* erp源库位编码
*/
@TableField("ERP_SRC_WRH_NUM")
private String erpSourceWarehouseNumber;
/**
* erp目标工厂名称
*/
@TableField("ERP_TGT_FACT_NAME")
private String erpTargetFactoryName;
/**
* erp目标工厂编码
*/
@TableField("ERP_TGT_FACT_NUM")
private String erpTargetFactoryNumber;
/**
* erp目标库位名称
*/
@TableField("ERP_TGT_WRH_NAME")
private String erpTargetWarehouseName;
/**
* erp目标库位编码
*/
@TableField("ERP_TGT_WRH_NUM")
private String erpTargetWarehouseNumber;
}

12
zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpWarehouseMapper.java
View File

@@ -20,4 +20,16 @@ public interface ErpWarehouseMapper extends BaseMapperX<ErpWarehouseDO> {
String selectMaxCode();
List<ErpWarehouseDO> getPageByReq(ErpWarehousePageReqVO pageReqVO);
default PageResult<ErpWarehouseDO> selectPage(ErpWarehousePageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<ErpWarehouseDO>()
.likeIfPresent(ErpWarehouseDO::getNumber, reqVO.getNumber())
.likeIfPresent(ErpWarehouseDO::getName, reqVO.getName())
.likeIfPresent(ErpWarehouseDO::getCompanyIdCustom, reqVO.getCompanyIdCustom())
.likeIfPresent(ErpWarehouseDO::getCompanyNameCustom, reqVO.getCompanyNameCustom())
.orderByDesc(ErpWarehouseDO::getId));
}
}

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