From 4cd7ebcea854eb545c7afae3c2b83076017e5e9f Mon Sep 17 00:00:00 2001 From: chenshuichuan <1154693969@qq.com> Date: Fri, 19 Jul 2024 16:02:50 +0800 Subject: [PATCH] fix erp --- sql/mysql/mes_data2.sql | 265 ++++++++++++++++++ .../admin/product/ErpProductController.java | 24 +- .../sale/vo/order/ErpSaleOrderPageReqVO.java | 2 + .../sale/vo/order/ErpSaleOrderRespVO.java | 4 + .../sale/vo/order/ErpSaleOrderSaveReqVO.java | 3 + .../dal/dataobject/sale/ErpSaleOrderDO.java | 3 +- .../FeedingRecordServiceImpl.java | 2 +- 7 files changed, 294 insertions(+), 9 deletions(-) diff --git a/sql/mysql/mes_data2.sql b/sql/mysql/mes_data2.sql index 6cfc7af2b..efcae0768 100644 --- a/sql/mysql/mes_data2.sql +++ b/sql/mysql/mes_data2.sql @@ -73,3 +73,268 @@ CREATE TABLE `mes_energy_device_check_record` ROW_FORMAT = DYNAMIC COMMENT ='抄表记录'; +CREATE TABLE `mes_dv_subject` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID', + `subject_code` varchar(64) NOT NULL COMMENT '项目编码', + `subject_name` varchar(255) NOT NULL COMMENT '项目名称', + `subject_type` varchar(64) DEFAULT '0' COMMENT '项目类型', + `subject_content` varchar(500) NOT NULL COMMENT '项目内容', + `subject_standard` varchar(255) DEFAULT NULL COMMENT '标准', + `is_enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否启用', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint DEFAULT NULL COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB + AUTO_INCREMENT = 91 + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_unicode_ci + ROW_FORMAT = DYNAMIC COMMENT ='点检项目表'; + +CREATE TABLE `mes_dv_check` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID', + `plan_code` varchar(64) NOT NULL COMMENT '计划编码', + `plan_name` varchar(255) DEFAULT NULL COMMENT '计划名称', + `plan_type` varchar(64) NOT NULL COMMENT '计划类型', + `start_date` datetime DEFAULT NULL COMMENT '开始日期', + `end_date` datetime DEFAULT NULL COMMENT '结束日期', + `cycle_type` varchar(64) DEFAULT NULL COMMENT '频率', + `cycle_count` int DEFAULT NULL COMMENT '次数', + `status` varchar(64) DEFAULT NULL COMMENT '状态', + `remark` varchar(500) DEFAULT '' COMMENT '备注', + `is_enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否启用', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint DEFAULT NULL COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB + AUTO_INCREMENT = 91 + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_unicode_ci + ROW_FORMAT = DYNAMIC COMMENT ='点检计划表'; + +CREATE TABLE `mes_dv_check_subject` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID', + `plan_id` bigint NOT NULL COMMENT '计划ID', + `subject_id` bigint NOT NULL COMMENT '设备ID', + `subject_code` varchar(64) NOT NULL COMMENT '项目编码', + `subject_name` varchar(255) DEFAULT NULL COMMENT '项目名称', + `subject_type` varchar(64) DEFAULT NULL COMMENT '项目类型', + `subject_content` varchar(500) NOT NULL COMMENT '项目内容', + `subject_standard` varchar(255) DEFAULT NULL COMMENT '标准', + `remark` varchar(500) DEFAULT '' COMMENT '备注', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint DEFAULT NULL COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB + AUTO_INCREMENT = 91 + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_unicode_ci + ROW_FORMAT = DYNAMIC COMMENT ='点检计划项目表'; + + +CREATE TABLE `mes_dv_check_device` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID', + `plan_id` bigint NOT NULL COMMENT '计划ID', + `machinery_id` bigint NOT NULL COMMENT '设备ID', + `machinery_code` varchar(64) NOT NULL COMMENT '设备编码', + `machinery_name` varchar(255) NOT NULL COMMENT '设备名称', + `machinery_brand` varchar(255) DEFAULT NULL COMMENT '品牌', + `machinery_spec` varchar(255) DEFAULT NULL COMMENT '规格型号', + `remark` varchar(500) DEFAULT '' COMMENT '备注', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint DEFAULT NULL COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB + AUTO_INCREMENT = 91 + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_unicode_ci + ROW_FORMAT = DYNAMIC COMMENT ='点检计划设备表'; + + +CREATE TABLE `mes_dv_check_record` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID', + `plan_id` bigint DEFAULT NULL COMMENT '计划ID', + `plan_code` varchar(64) DEFAULT NULL COMMENT '计划编码', + `plan_name` varchar(255) DEFAULT NULL COMMENT '计划名称', + `plan_type` varchar(64) DEFAULT NULL COMMENT '计划类型', + `machinery_id` bigint NOT NULL COMMENT '设备ID', + `machinery_code` varchar(64) NOT NULL COMMENT '设备编码', + `machinery_name` varchar(255) NOT NULL COMMENT '设备名称', + `machinery_brand` varchar(255) DEFAULT NULL COMMENT '品牌', + `machinery_spec` varchar(255) DEFAULT NULL COMMENT '规格型号', + `check_time` datetime NOT NULL COMMENT '点检时间', + `status` varchar(64) DEFAULT 'PREPARE' COMMENT '状态', + `is_enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否启用', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint DEFAULT NULL COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB + AUTO_INCREMENT = 91 + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_unicode_ci + ROW_FORMAT = DYNAMIC COMMENT ='设备点检记录表'; + +CREATE TABLE `mes_dv_check_record_line` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID', + `record_id` bigint NOT NULL COMMENT '计划ID', + `subject_id` bigint NOT NULL COMMENT '项目ID', + `subject_code` varchar(64) NOT NULL COMMENT '项目编码', + `subject_name` varchar(255) DEFAULT NULL COMMENT '项目名称', + `subject_type` varchar(64) DEFAULT NULL COMMENT '项目类型', + `subject_content` varchar(500) NOT NULL COMMENT '项目内容', + `subject_standard` varchar(255) DEFAULT NULL COMMENT '标准', + `check_status` varchar(64) NOT NULL COMMENT '点检结果', + `check_result` varchar(500) DEFAULT NULL COMMENT '异常描述', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint DEFAULT NULL COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB + AUTO_INCREMENT = 91 + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_unicode_ci + ROW_FORMAT = DYNAMIC COMMENT ='设备点检记录行表'; + + + +CREATE TABLE `mes_dv_maintain_record` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID', + `plan_id` bigint DEFAULT NULL COMMENT '计划ID', + `plan_code` varchar(64) DEFAULT NULL COMMENT '计划编码', + `plan_name` varchar(255) DEFAULT NULL COMMENT '计划名称', + `plan_type` varchar(64) DEFAULT NULL COMMENT '计划类型', + `machinery_id` bigint NOT NULL COMMENT '设备ID', + `machinery_code` varchar(64) NOT NULL COMMENT '设备编码', + `machinery_name` varchar(255) NOT NULL COMMENT '设备名称', + `machinery_brand` varchar(255) DEFAULT NULL COMMENT '品牌', + `machinery_spec` varchar(255) DEFAULT NULL COMMENT '规格型号', + `mainten_time` datetime NOT NULL COMMENT '保养时间', + `status` varchar(64) DEFAULT 'PREPARE' COMMENT '状态', + `remark` varchar(500) DEFAULT '' COMMENT '备注', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint DEFAULT NULL COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB + AUTO_INCREMENT = 91 + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_unicode_ci + ROW_FORMAT = DYNAMIC COMMENT ='设备保养记录表'; + +CREATE TABLE `mes_dv_maintain_record_line` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID', + `record_id` bigint NOT NULL COMMENT '计划ID', + `subject_id` bigint NOT NULL COMMENT '项目ID', + `subject_code` varchar(64) NOT NULL COMMENT '项目编码', + `subject_name` varchar(255) DEFAULT NULL COMMENT '项目名称', + `subject_type` varchar(64) DEFAULT NULL COMMENT '项目类型', + `subject_content` varchar(500) NOT NULL COMMENT '项目内容', + `subject_standard` varchar(255) DEFAULT NULL COMMENT '标准', + `maintain_status` varchar(64) NOT NULL COMMENT '保养结果', + `maintain_result` varchar(500) DEFAULT NULL COMMENT '异常描述', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint DEFAULT NULL COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB + AUTO_INCREMENT = 91 + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_unicode_ci + ROW_FORMAT = DYNAMIC COMMENT ='设备保养记录行表'; + + + +CREATE TABLE `mes_dv_repair` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID', + `repair_code` varchar(64) NOT NULL COMMENT '维修单编号', + `repair_name` varchar(255) DEFAULT NULL COMMENT '维修单名称', + `machinery_id` bigint NOT NULL COMMENT '设备ID', + `machinery_code` varchar(64) NOT NULL COMMENT '设备编码', + `machinery_name` varchar(255) NOT NULL COMMENT '设备名称', + `machinery_brand` varchar(255) DEFAULT NULL COMMENT '品牌', + `machinery_spec` varchar(255) DEFAULT NULL COMMENT '规格型号', + `machinery_type_id` bigint NOT NULL COMMENT '设备类型ID', + `require_date` datetime DEFAULT NULL COMMENT '报修日期', + `finish_date` datetime DEFAULT NULL COMMENT '维修完成日期', + `confirm_date` datetime DEFAULT NULL COMMENT '验收日期', + `repair_result` varchar(64) DEFAULT NULL COMMENT '维修结果', + `accepted_by` varchar(64) DEFAULT NULL COMMENT '维修人员', + `confirm_by` varchar(64) DEFAULT NULL COMMENT '验收人员', + `status` varchar(64) DEFAULT 'PREPARE' COMMENT '单据状态', + `remark` varchar(500) DEFAULT '' COMMENT '备注', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint DEFAULT NULL COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB + AUTO_INCREMENT = 91 + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_unicode_ci + ROW_FORMAT = DYNAMIC COMMENT ='设备点检记录表'; + +CREATE TABLE `mes_dv_repair_line` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID', + `repair_id` bigint NOT NULL COMMENT '维修单ID', + `subject_id` bigint NOT NULL COMMENT '项目ID', + `subject_code` varchar(64) NOT NULL COMMENT '项目编码', + `subject_name` varchar(255) DEFAULT NULL COMMENT '项目名称', + `subject_type` varchar(64) DEFAULT NULL COMMENT '项目类型', + `subject_content` varchar(500) NOT NULL COMMENT '项目内容', + `subject_standard` varchar(255) DEFAULT NULL COMMENT '标准', + `malfunction` varchar(500) DEFAULT NULL COMMENT '故障描述', + `malfunction_url` varchar(255) DEFAULT NULL COMMENT '故障描述资源', + `repair_des` varchar(500) DEFAULT NULL COMMENT '维修情况', + `remark` varchar(500) DEFAULT '' COMMENT '备注', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint DEFAULT NULL COMMENT '租户id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB + AUTO_INCREMENT = 91 + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_unicode_ci + ROW_FORMAT = DYNAMIC COMMENT ='设备点检记录行表'; \ No newline at end of file diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductController.java index fd6def335..be34e8c0f 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductController.java @@ -7,16 +7,18 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; +import cn.iocoder.yudao.module.erp.controller.admin.product.vo.category.ErpProductCategoryListReqVO; import cn.iocoder.yudao.module.erp.controller.admin.product.vo.product.ErpProductPageReqVO; import cn.iocoder.yudao.module.erp.controller.admin.product.vo.product.ErpProductRespVO; import cn.iocoder.yudao.module.erp.controller.admin.product.vo.product.ProductSaveReqVO; +import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductCategoryDO; import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductDO; import cn.iocoder.yudao.module.erp.framework.bean.ProductTypeEnum; +import cn.iocoder.yudao.module.erp.service.product.ErpProductCategoryService; import cn.iocoder.yudao.module.erp.service.product.ErpProductService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -25,7 +27,6 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; @@ -110,15 +111,24 @@ public class ErpProductController { .setUnitId(product.getUnitId()).setUnitName(product.getUnitName()) .setPurchasePrice(product.getPurchasePrice()).setSalePrice(product.getSalePrice()).setMinPrice(product.getMinPrice()))); } + @Resource + private ErpProductCategoryService productCategoryService; @GetMapping("/simple-list-order") @Operation(summary = "获得采购商品精简列表", description = "不包含产品，主要用于前端的下拉选项") public CommonResult> getOrderSimpleList() { + List categoryDOList = productCategoryService.getProductCategoryList(new ErpProductCategoryListReqVO()); List categorys = new ArrayList<>(); - categorys.add(ProductTypeEnum.ITEM.getTypeId()); - categorys.add(ProductTypeEnum.TOOL.getTypeId()); - categorys.add(ProductTypeEnum.HAOCAI.getTypeId()); - categorys.add(ProductTypeEnum.GUANJJ.getTypeId()); - List productDOList = productService.selectByCategorys(categorys); + long pId = ProductTypeEnum.PRODUCT.getTypeId().longValue(); + for (ErpProductCategoryDO caDO: categoryDOList) { + if(caDO.getId() != pId){ + categorys.add(caDO.getId().intValue()); + } + } +// categorys.add(ProductTypeEnum.ITEM.getTypeId()); +// categorys.add(ProductTypeEnum.TOOL.getTypeId()); +// categorys.add(ProductTypeEnum.HAOCAI.getTypeId()); +// categorys.add(ProductTypeEnum.GUANJJ.getTypeId()); + List productDOList = productService.selectByCategorys(categorys); List list = productService.buildProductVOList(productDOList); return success(convertList(list, product -> new ErpProductRespVO().setId(product.getId()) diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderPageReqVO.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderPageReqVO.java index 84d92fb67..2c7bfcd04 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderPageReqVO.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderPageReqVO.java @@ -52,6 +52,8 @@ public class ErpSaleOrderPageReqVO extends PageParam { @Schema(description = "下单时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] orderTime; + @Schema(description = "出货时间") + private LocalDateTime planOutTime; @Schema(description = "备注", example = "你猜") private String remark; diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderRespVO.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderRespVO.java index 370ea09db..a4133e213 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderRespVO.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderRespVO.java @@ -100,6 +100,10 @@ public class ErpSaleOrderRespVO { @Schema(description = "销售退货数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00") private BigDecimal returnCount; + @Schema(description = "出货时间") + @ExcelProperty("出货时间") + private LocalDateTime planOutTime; + @Data public static class Item { diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderSaveReqVO.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderSaveReqVO.java index f743a841a..0f6e7ed11 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderSaveReqVO.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderSaveReqVO.java @@ -22,6 +22,9 @@ public class ErpSaleOrderSaveReqVO { @Schema(description = "下单时间", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "下单时间不能为空") private LocalDateTime orderTime; + @Schema(description = "出货时间") + //@ExcelProperty("出货时间") + private LocalDateTime planOutTime; @Schema(description = "销售员编号", example = "1888") private Long saleUserId; diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderDO.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderDO.java index 5cdd4344e..11a863a26 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderDO.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderDO.java @@ -62,7 +62,8 @@ public class ErpSaleOrderDO extends BaseDO { * 下单时间 */ private LocalDateTime orderTime; - + //@Schema(description = "出货时间") + private LocalDateTime planOutTime; /** * 合计数量 */ diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/feedingrecord/FeedingRecordServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/feedingrecord/FeedingRecordServiceImpl.java index 3a03b897d..816482d05 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/feedingrecord/FeedingRecordServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/feedingrecord/FeedingRecordServiceImpl.java @@ -219,7 +219,7 @@ public class FeedingRecordServiceImpl implements FeedingRecordService { MapUtils.findAndThen(unitMap, item.getUnitId(), unit -> item.setUnitName(unit.getName())); MapUtils.findAndThen(userMap, item.getUserId(), - user -> item.setUnitName(user.getNickname())); + user -> item.setUserName(user.getNickname())); }); }