Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-14 13:42:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

数据结构修改

Browse Source
This commit is contained in:
lym
2024-04-28 16:14:06 +08:00
parent f12ef9e9eb
commit 95e6477f28
37 changed files with 681 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/PlateController.java
+5 -5
View File
@@ -107,9 +107,9 @@ public class PlateController {
// 手动创建导出 demo
List<PlateImportExcelVO> list = Arrays.asList(
PlateImportExcelVO.builder().goodsId("SP1123456").goodsName("xixih").material("颗粒板").width(String.valueOf(1212.3)).height(String.valueOf(12131.6))
.thickness(String.valueOf(0.2)).brand("鹅厂").spec("大厂").remark("测试").price(String.valueOf(33333.2)).color("黑色").build(),
.thickness(String.valueOf(0.2)).brand("鹅厂").spec("大厂").remark("测试").price(String.valueOf(33333.2)).color("黑色").texture("交换机1").build(),
PlateImportExcelVO.builder().goodsId("SP1123457").goodsName("2L").material("yuanma@cf.com").width(String.valueOf(21.6)).height(String.valueOf(12231.6))
.thickness(String.valueOf(5.3)).brand("kkkkkk").spec("大厂").remark("测试").price(String.valueOf(333.555)).color("黑色").build()
.thickness(String.valueOf(5.3)).brand("kkkkkk").spec("大厂").remark("测试").price(String.valueOf(333.555)).color("黑色").texture("交换机2").build()
);
// 输出
ExcelUtils.write(response, "板材导入模板.xlsx", "板材列表", PlateImportExcelVO.class, list);
@@ -129,12 +129,12 @@ public class PlateController {
HttpServletResponse response) throws Exception {
PlateExcelUtil plateExcelUtil = new PlateExcelUtil();
List<PlateImportExcelVO> list = plateExcelUtil.read(file, PlateImportExcelVO.class);
// 判断文件是否导入成功
if (!plateExcelUtil.getFlag())
ExcelUtils.write(response, "板材导入模板.xlsx", "板材列表", PlateImportExcelVO.class, list);
else
plateService.importPlateList(list, updateSupport, organId);// 成功，批量导入
else {
PlateImportRespVO respVO = plateService.importPlateList(list, updateSupport, organId);// 成功，批量导入
}
plateExcelUtil.clear();
}
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlateImportExcelVO.java
+4
View File
@@ -36,6 +36,10 @@ public class PlateImportExcelVO {
@NotEmpty(message = "颜色不能为空")
private String color;
@ExcelProperty("纹路")
@NotEmpty(message = "纹路不能为空")
private String texture;
@ExcelProperty("宽度")
@NotEmpty(message = "宽度不能为空")
private String width;
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlatePageReqVO.java
+6
View File
@@ -1,10 +1,13 @@
package com.cf.imes.module.manage.controller.admin.plate.vo.plate;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.*;
import io.swagger.v3.oas.annotations.media.Schema;
import com.cf.imes.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotEmpty;
import java.time.LocalDateTime;
import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -27,6 +30,9 @@ public class PlatePageReqVO extends PageParam {
@Schema(description = "颜色")
private String color;
@Schema(description = "纹路")
private String texture;
@Schema(description = "宽度")
private Double width;
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlateRespVO.java
+4
View File
@@ -31,6 +31,10 @@ public class PlateRespVO {
@ExcelProperty("颜色")
private String color;
@Schema(description = "纹路", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("纹路")
private String texture;
@Schema(description = "宽度", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("宽度")
private Double width;
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/plate/PlateSaveReqVO.java
+5
View File
@@ -1,5 +1,6 @@
package com.cf.imes.module.manage.controller.admin.plate.vo.plate;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import javax.validation.constraints.NotEmpty;
@@ -28,6 +29,10 @@ public class PlateSaveReqVO {
@NotEmpty(message = "颜色不能为空")
private String color;
@Schema(description = "纹路", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "纹路不能为空")
private String texture;
@Schema(description = "宽度", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "宽度不能为空")
private Double width;
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/plate/PlateDO.java
+4
View File
@@ -41,6 +41,10 @@ public class PlateDO extends BaseDO {
* 颜色
*/
private String color;
/**
* 纹路
*/
private String texture;
/**
* 宽度
*/
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateServiceImpl.java
+5 -9
View File
@@ -46,7 +46,7 @@ public class PlateServiceImpl implements PlateService {
@Override
public Long createPlate(PlateSaveReqVO createReqVO) {
PlateDO plate = BeanUtils.toBean(createReqVO, PlateDO.class);
if (createReqVO.getOrganId() != null && createReqVO.getOrganId() != 0 ){
if (createReqVO.getOrganId() == null && createReqVO.getOrganId() == 0 ){
validateOrganExists(createReqVO.getOrganId());
validateGoodExists(createReqVO.getGoodsId(), createReqVO.getOrganId());
plate.setOrganId(OrganContextHolder.getOrganId());
@@ -118,20 +118,16 @@ public class PlateServiceImpl implements PlateService {
// 判断如果不存在，在进行插入
PlateDO existPlate = plateMapper.selectByGoodID(importPlate.getGoodsId(), organId);
if (existPlate == null) {
respVO.getCreatePlateNames().add(importPlate.getGoodsName());
insertList.add(BeanUtils.toBean(importPlate, PlateDO.class).setOrganId(organId));
// plateMapper.insert(BeanUtils.toBean(importPlate, PlateDO.class).setOrganId(organId));
// respVO.getCreatePlateNames().add(importPlate.getGoodsName());
return;
}
// 如果存在，判断是否允许更新
// 判断是否允许更新
if (!isUpdateSupport) {
respVO.getFailurePlateNames().put(importPlate.getGoodsName(), ErrorCodeConstants.PLATE_EXISTS.getMsg());
return;
PlateDO plateDO = BeanUtils.toBean(importPlate, PlateDO.class).setOrganId(organId).setId(existPlate.getId());
updateList.add(plateDO);
}
PlateDO plateDO = BeanUtils.toBean(importPlate, PlateDO.class).setOrganId(organId).setId(existPlate.getId());
updateList.add(plateDO);
// plateMapper.updateById(plateDO);
// respVO.getUpdatePlateNames().add(importPlate.getGoodsName());
});
// 批量插入，批量更新
if (insertList.size() > 0 && insertList != null) {