CaiXiang/cigs4
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

新增场景产品等级 料号颜色解析

Browse Source
This commit is contained in:
闫阳
2023-12-25 16:56:55 +08:00
parent 558e106f17
commit db6a0a7739
55 changed files with 2091 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
ym-packing/src/main/java/com/cnbm/packing/controller/ProductLevelController.java Normal file
View File

@@ -0,0 +1,116 @@
package com.cnbm.packing.controller;
import com.cnbm.admin.annotation.LogOperation;
import com.cnbm.common.constant.Constant;
import com.cnbm.common.page.PageData;
import com.cnbm.common.utils.ExcelUtils;
import com.cnbm.common.utils.Result;
import com.cnbm.common.validator.AssertUtils;
import com.cnbm.common.validator.ValidatorUtils;
import com.cnbm.common.validator.group.AddGroup;
import com.cnbm.common.validator.group.DefaultGroup;
import com.cnbm.common.validator.group.UpdateGroup;
import com.cnbm.packing.dto.ProductLevelDTO;
import com.cnbm.packing.excel.ProductLevelExcel;
import com.cnbm.packing.service.ProductLevelServiceBiz;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
/**
* 产品等级 表 前端控制器
*
* @author codeGenerator
* @since 2023-12-21
*/
@RestController
@RequestMapping("/basic/productLevel")
@Api(tags="产品等级 表")
public class ProductLevelController {
@Autowired
private ProductLevelServiceBiz productLevelService;
@GetMapping("page")
@ApiOperation("分页")
@ApiImplicitParams({
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) ,
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) ,
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) ,
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class)
})
@PreAuthorize("@ex.hasAuthority('basic:productLevel:page')")
public Result<PageData<ProductLevelDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
PageData<ProductLevelDTO> page = productLevelService.page(params);
return new Result<PageData<ProductLevelDTO>>().ok(page);
}
@GetMapping("{id}")
@ApiOperation("信息")
@PreAuthorize("@ex.hasAuthority('basic:productLevel:info')")
public Result<ProductLevelDTO> get(@PathVariable("id") Long id){
ProductLevelDTO data = productLevelService.get(id);
return new Result<ProductLevelDTO>().ok(data);
}
@PostMapping
@ApiOperation("保存")
@LogOperation("保存")
@PreAuthorize("@ex.hasAuthority('basic:productLevel:save')")
public Result<Long> save(@RequestBody ProductLevelDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
productLevelService.save(dto);
return new Result<Long>().ok(dto.getId());
}
@PutMapping
@ApiOperation("修改")
@LogOperation("修改")
@PreAuthorize("@ex.hasAuthority('basic:productLevel:update')")
public Result<Long> update(@RequestBody ProductLevelDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
productLevelService.update(dto);
return new Result<Long>().ok(dto.getId());
}
@DeleteMapping
@ApiOperation("删除")
@LogOperation("删除")
@PreAuthorize("@ex.hasAuthority('basic:productLevel:delete')")
public Result delete(@RequestBody Long[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
productLevelService.delete(ids);
return new Result();
}
@GetMapping("export")
@ApiOperation("导出")
@LogOperation("导出")
@PreAuthorize("@ex.hasAuthority('basic:productLevel:export')")
public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<ProductLevelDTO> list = productLevelService.list(params);
ExcelUtils.exportExcelToTarget(response, null, list, ProductLevelExcel.class);
}
}

116
ym-packing/src/main/java/com/cnbm/packing/controller/ScenesController.java Normal file
View File

@@ -0,0 +1,116 @@
package com.cnbm.packing.controller;
import com.cnbm.admin.annotation.LogOperation;
import com.cnbm.common.constant.Constant;
import com.cnbm.common.page.PageData;
import com.cnbm.common.utils.ExcelUtils;
import com.cnbm.common.utils.Result;
import com.cnbm.common.validator.AssertUtils;
import com.cnbm.common.validator.ValidatorUtils;
import com.cnbm.common.validator.group.AddGroup;
import com.cnbm.common.validator.group.DefaultGroup;
import com.cnbm.common.validator.group.UpdateGroup;
import com.cnbm.packing.dto.ScenesDTO;
import com.cnbm.packing.excel.ScenesExcel;
import com.cnbm.packing.service.ScenesServiceBiz;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
/**
* 场景 表 前端控制器
*
* @author codeGenerator
* @since 2023-12-21
*/
@RestController
@RequestMapping("/basic/scenes")
@Api(tags="场景 表")
public class ScenesController {
@Autowired
private ScenesServiceBiz scenesService;
@GetMapping("page")
@ApiOperation("分页")
@ApiImplicitParams({
@ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataTypeClass=Integer.class) ,
@ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataTypeClass=Integer.class) ,
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataTypeClass=String.class) ,
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class)
})
@PreAuthorize("@ex.hasAuthority('basic:scenes:page')")
public Result<PageData<ScenesDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
PageData<ScenesDTO> page = scenesService.page(params);
return new Result<PageData<ScenesDTO>>().ok(page);
}
@GetMapping("{id}")
@ApiOperation("信息")
@PreAuthorize("@ex.hasAuthority('basic:scenes:info')")
public Result<ScenesDTO> get(@PathVariable("id") Long id){
ScenesDTO data = scenesService.get(id);
return new Result<ScenesDTO>().ok(data);
}
@PostMapping
@ApiOperation("保存")
@LogOperation("保存")
@PreAuthorize("@ex.hasAuthority('basic:scenes:save')")
public Result<Long> save(@RequestBody ScenesDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
scenesService.save(dto);
return new Result<Long>().ok(dto.getId());
}
@PutMapping
@ApiOperation("修改")
@LogOperation("修改")
@PreAuthorize("@ex.hasAuthority('basic:scenes:update')")
public Result<Long> update(@RequestBody ScenesDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
scenesService.update(dto);
return new Result<Long>().ok(dto.getId());
}
@DeleteMapping
@ApiOperation("删除")
@LogOperation("删除")
@PreAuthorize("@ex.hasAuthority('basic:scenes:delete')")
public Result delete(@RequestBody Long[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
scenesService.delete(ids);
return new Result();
}
@GetMapping("export")
@ApiOperation("导出")
@LogOperation("导出")
@PreAuthorize("@ex.hasAuthority('basic:scenes:export')")
public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<ScenesDTO> list = scenesService.list(params);
ExcelUtils.exportExcelToTarget(response, null, list, ScenesExcel.class);
}
}

2
ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxController.java
View File

@@ -65,7 +65,7 @@ public class WoPackagingBoxController {
})
public Result<PageData<WoPackagingBoxDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params){
PageData<WoPackagingBoxDTO> page = woPackagingBoxService.page(params);
woPackagingBoxService.setColor(page.getList());
return new Result<PageData<WoPackagingBoxDTO>>().ok(page);
}

1
ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxSubstrateController.java
View File

@@ -343,6 +343,7 @@ public class WoPackagingBoxSubstrateController {
@ApiOperation("装箱单信息查询")
public Result<PageData<WoPackagingBoxSubstrateDTO>> substrateList(@RequestBody PackingInfoQueryParam param){
PageData<WoPackagingBoxSubstrateDTO> page = woPackagingBoxSubstrateService.substratePage(param);
woPackagingBoxSubstrateService.setColor(page.getList());
return new Result<PageData<WoPackagingBoxSubstrateDTO>>().ok(page);
}

4
ym-packing/src/main/java/com/cnbm/packing/dto/PrintModelDTO.java
View File

@@ -80,10 +80,10 @@ public class PrintModelDTO implements Serializable {
@ApiModelProperty(value = "是否启用，0 停用；1 启用")
private Integer isEnable;
@ApiModelProperty(value = "场景，前端传字符串过来，目前固定这几个：DZ BIPV")
@ApiModelProperty(value = "场景，前端传字符串过来，t_scenes 把value传过来放进去，不要放id")
private String scenes;
@ApiModelProperty(value = "产品等级，目前固定这几个 : A1 A2 A3 A4 NK")
@ApiModelProperty(value = "产品等级，t_product_level 把value传过来放进去，不要放id")
private String productGrade;
}

60
ym-packing/src/main/java/com/cnbm/packing/dto/ProductLevelDTO.java Normal file
View File

@@ -0,0 +1,60 @@
package com.cnbm.packing.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* 产品等级 表
*
* @author codeGenerator
* @since 2023-12-21
*/
@Data
@ApiModel(value = "产品等级 表DTO对象")
public class ProductLevelDTO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "ID")
private Long id;
@ApiModelProperty(value = "产品名")
private String productName;
@ApiModelProperty(value = "产品等级，A1/A2/A3/A4/NK")
private LocalDateTime productLevel;
@ApiModelProperty(value = "备注")
private String remark;
@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
private Integer valid;
@ApiModelProperty(value = "创建人")
private Long creatorId;
@ApiModelProperty(value = "创建人姓名")
private String creatorName;
@ApiModelProperty(value = "创建时间")
private LocalDateTime createTime;
@ApiModelProperty(value = "更新人")
private Long updaterId;
@ApiModelProperty(value = "更新人姓名")
private String updaterName;
@ApiModelProperty(value = "更新时间")
private LocalDateTime updateTime;
@ApiModelProperty(value = "版本号")
private Integer version;
}

57
ym-packing/src/main/java/com/cnbm/packing/dto/ScenesDTO.java Normal file
View File

@@ -0,0 +1,57 @@
package com.cnbm.packing.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* 场景 表
*
* @author codeGenerator
* @since 2023-12-21
*/
@Data
@ApiModel(value = "场景 表DTO对象")
public class ScenesDTO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "ID")
private Long id;
@ApiModelProperty(value = "场景名")
private String scenesName;
@ApiModelProperty(value = "备注")
private String remark;
@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
private Integer valid;
@ApiModelProperty(value = "创建人")
private Long creatorId;
@ApiModelProperty(value = "创建人姓名")
private String creatorName;
@ApiModelProperty(value = "创建时间")
private LocalDateTime createTime;
@ApiModelProperty(value = "更新人")
private Long updaterId;
@ApiModelProperty(value = "更新人姓名")
private String updaterName;
@ApiModelProperty(value = "更新时间")
private LocalDateTime updateTime;
@ApiModelProperty(value = "版本号")
private Integer version;
}

5
ym-packing/src/main/java/com/cnbm/packing/dto/WoPackagingBoxDTO.java
View File

@@ -116,6 +116,9 @@ public class WoPackagingBoxDTO implements Serializable {
private String orderNum;
@ApiModelProperty(value = "基板列表")
private List<WoPackagingBoxSubstrate> substrateList;;
private List<WoPackagingBoxSubstrate> substrateList;
@ApiModelProperty(value = "颜色（物料号匹配）")
private String color;
}

3
ym-packing/src/main/java/com/cnbm/packing/dto/WoPackagingBoxSubstrateDTO.java
View File

@@ -185,4 +185,7 @@ public class WoPackagingBoxSubstrateDTO implements Serializable {
@ApiModelProperty(value = "最近打印时间(转)")
private String printTime1;
@ApiModelProperty(value = "颜色（物料号匹配）")
private String color;
}

4
ym-packing/src/main/java/com/cnbm/packing/entity/PrintModel.java
View File

@@ -81,10 +81,10 @@ public class PrintModel implements Serializable {
@ApiModelProperty("是否启用，0 停用；1 启用")
private Integer isEnable;
@ApiModelProperty("场景，前端传字符串过来，目前固定这几个：DZ BIPV")
@ApiModelProperty("场景，前端传字符串过来，t_scenes 把value传过来放进去，不要放id")
private String scenes;
@ApiModelProperty("产品等级，目前固定这几个 : A1 A2 A3 A4 NK")
@ApiModelProperty("产品等级，t_product_level 把value传过来放进去，不要放id")
private String productGrade;

89
ym-packing/src/main/java/com/cnbm/packing/entity/ProductLevel.java Normal file
View File

@@ -0,0 +1,89 @@
package com.cnbm.packing.entity;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* <p>
* 产品等级 表
* </p>
*
* @author codeGenerator
* @since 2023-12-21
*/
@Data
@TableName("t_product_level")
@ApiModel(value = "ProductLevel对象", description = "产品等级 表")
public class ProductLevel implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("ID")
private Long id;
@ApiModelProperty("产品名")
private String productName;
@ApiModelProperty("产品等级，A1/A2/A3/A4/NK")
private LocalDateTime productLevel;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
@TableLogic
private Integer valid;
@ApiModelProperty("创建人")
private Long creatorId;
@ApiModelProperty("创建人姓名")
private String creatorName;
@ApiModelProperty("创建时间")
private LocalDateTime createTime;
@ApiModelProperty("更新人")
private Long updaterId;
@ApiModelProperty("更新人姓名")
private String updaterName;
@ApiModelProperty("更新时间")
private LocalDateTime updateTime;
@ApiModelProperty("版本号")
private Integer version;
public static final String ID = "id";
public static final String PRODUCT_NAME = "product_name";
public static final String PRODUCT_LEVEL = "product_level";
public static final String REMARK = "remark";
public static final String VALID = "valid";
public static final String CREATOR_ID = "creator_id";
public static final String CREATOR_NAME = "creator_name";
public static final String CREATE_TIME = "create_time";
public static final String UPDATER_ID = "updater_id";
public static final String UPDATER_NAME = "updater_name";
public static final String UPDATE_TIME = "update_time";
public static final String VERSION = "version";
}

84
ym-packing/src/main/java/com/cnbm/packing/entity/Scenes.java Normal file
View File

@@ -0,0 +1,84 @@
package com.cnbm.packing.entity;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* <p>
* 场景 表
* </p>
*
* @author codeGenerator
* @since 2023-12-21
*/
@Data
@TableName("t_scenes")
@ApiModel(value = "Scenes对象", description = "场景 表")
public class Scenes implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("ID")
private Long id;
@ApiModelProperty("场景名")
private String scenesName;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("删除标志，是否有效:1 可用 0不可用")
@TableLogic
private Integer valid;
@ApiModelProperty("创建人")
private Long creatorId;
@ApiModelProperty("创建人姓名")
private String creatorName;
@ApiModelProperty("创建时间")
private LocalDateTime createTime;
@ApiModelProperty("更新人")
private Long updaterId;
@ApiModelProperty("更新人姓名")
private String updaterName;
@ApiModelProperty("更新时间")
private LocalDateTime updateTime;
@ApiModelProperty("版本号")
private Integer version;
public static final String ID = "id";
public static final String SCENES_NAME = "scenes_name";
public static final String REMARK = "remark";
public static final String VALID = "valid";
public static final String CREATOR_ID = "creator_id";
public static final String CREATOR_NAME = "creator_name";
public static final String CREATE_TIME = "create_time";
public static final String UPDATER_ID = "updater_id";
public static final String UPDATER_NAME = "updater_name";
public static final String UPDATE_TIME = "update_time";
public static final String VERSION = "version";
}

4
ym-packing/src/main/java/com/cnbm/packing/excel/PrintModelExcel.java
View File

@@ -54,5 +54,9 @@ public class PrintModelExcel {
private Integer lineBody;
@Excel(name = "是否启用，0 停用；1 启用")
private Integer isEnable;
@Excel(name = "场景，前端传字符串过来，t_scenes 把value传过来放进去，不要放id")
private String scenes;
@Excel(name = "产品等级，t_product_level 把value传过来放进去，不要放id")
private String productGrade;
}

41
ym-packing/src/main/java/com/cnbm/packing/excel/ProductLevelExcel.java Normal file
View File

@@ -0,0 +1,41 @@
package com.cnbm.packing.excel;
import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.time.LocalDateTime;
/**
* 产品等级 表
*
* @author codeGenerator
* @since 2023-12-21
*/
@Data
public class ProductLevelExcel {
@Excel(name = "ID")
private Long id;
@Excel(name = "产品名")
private String productName;
@Excel(name = "产品等级，A1/A2/A3/A4/NK")
private LocalDateTime productLevel;
@Excel(name = "备注")
private String remark;
@Excel(name = "删除标志，是否有效:1 可用 0不可用")
private Integer valid;
@Excel(name = "创建人")
private Long creatorId;
@Excel(name = "创建人姓名")
private String creatorName;
@Excel(name = "创建时间")
private LocalDateTime createTime;
@Excel(name = "更新人")
private Long updaterId;
@Excel(name = "更新人姓名")
private String updaterName;
@Excel(name = "更新时间")
private LocalDateTime updateTime;
@Excel(name = "版本号")
private Integer version;
}

39
ym-packing/src/main/java/com/cnbm/packing/excel/ScenesExcel.java Normal file
View File

@@ -0,0 +1,39 @@
package com.cnbm.packing.excel;
import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.time.LocalDateTime;
/**
* 场景 表
*
* @author codeGenerator
* @since 2023-12-21
*/
@Data
public class ScenesExcel {
@Excel(name = "ID")
private Long id;
@Excel(name = "场景名")
private String scenesName;
@Excel(name = "备注")
private String remark;
@Excel(name = "删除标志，是否有效:1 可用 0不可用")
private Integer valid;
@Excel(name = "创建人")
private Long creatorId;
@Excel(name = "创建人姓名")
private String creatorName;
@Excel(name = "创建时间")
private LocalDateTime createTime;
@Excel(name = "更新人")
private Long updaterId;
@Excel(name = "更新人姓名")
private String updaterName;
@Excel(name = "更新时间")
private LocalDateTime updateTime;
@Excel(name = "版本号")
private Integer version;
}

21
ym-packing/src/main/java/com/cnbm/packing/mapper/ProductLevelMapper.java Normal file
View File

@@ -0,0 +1,21 @@
package com.cnbm.packing.mapper;
import com.cnbm.common.dao.BaseDao;
import com.cnbm.packing.dto.ProductLevelDTO;
import com.cnbm.packing.entity.ProductLevel;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 产品等级 表
*
* @author codeGenerator
* @since 2023-12-21
*/
@Mapper
public interface ProductLevelMapper extends BaseDao<ProductLevel> {
List<ProductLevelDTO> list();
}

21
ym-packing/src/main/java/com/cnbm/packing/mapper/ScenesMapper.java Normal file
View File

@@ -0,0 +1,21 @@
package com.cnbm.packing.mapper;
import com.cnbm.common.dao.BaseDao;
import com.cnbm.packing.dto.ScenesDTO;
import com.cnbm.packing.entity.Scenes;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 场景 表
*
* @author codeGenerator
* @since 2023-12-21
*/
@Mapper
public interface ScenesMapper extends BaseDao<Scenes> {
List<ScenesDTO> list();
}

31
ym-packing/src/main/java/com/cnbm/packing/service/ProductLevelServiceBiz.java Normal file
View File

@@ -0,0 +1,31 @@
package com.cnbm.packing.service;
import com.cnbm.common.page.PageData;
import com.cnbm.common.service.CrudService;
import com.cnbm.packing.dto.ProductLevelDTO;
import com.cnbm.packing.entity.ProductLevel;
import java.util.List;
import java.util.Map;
/**
* 产品等级 表
*
* @author codeGenerator
* @since 2023-12-21
*/
public interface ProductLevelServiceBiz extends CrudService<ProductLevel, ProductLevelDTO> {
PageData<ProductLevelDTO> page (Map<String, Object> params);
ProductLevelDTO get(Long id);
void save(ProductLevelDTO dto);
void update(ProductLevelDTO dto);
void delete(Long[] ids);
List<ProductLevelDTO> list();
}

31
ym-packing/src/main/java/com/cnbm/packing/service/ScenesServiceBiz.java Normal file
View File

@@ -0,0 +1,31 @@
package com.cnbm.packing.service;
import com.cnbm.common.page.PageData;
import com.cnbm.common.service.CrudService;
import com.cnbm.packing.dto.ScenesDTO;
import com.cnbm.packing.entity.Scenes;
import java.util.List;
import java.util.Map;
/**
* 场景 表
*
* @author codeGenerator
* @since 2023-12-21
*/
public interface ScenesServiceBiz extends CrudService<Scenes, ScenesDTO> {
PageData<ScenesDTO> page (Map<String, Object> params);
ScenesDTO get(Long id);
void save(ScenesDTO dto);
void update(ScenesDTO dto);
void delete(Long[] ids);
List<ScenesDTO> list();
}

2
ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxServiceBiz.java
View File

@@ -56,4 +56,6 @@ public interface WoPackagingBoxServiceBiz extends CrudService<WoPackagingBox, Wo
List<String> orderNameList();
R<IPage<SubIdPageVo>> subIdPage(SubIdQueryParam param);
void setColor(List<WoPackagingBoxDTO> list);
}

2
ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxSubstrateServiceBiz.java
View File

@@ -46,4 +46,6 @@ public interface WoPackagingBoxSubstrateServiceBiz extends CrudService<WoPackagi
int updatePackagingBoxIdAndSlotByWoSubstrateId(String packagingBoxId,Integer slot,String woSubstrateId);
void setColor(List<WoPackagingBoxSubstrateDTO> list);
}

90
ym-packing/src/main/java/com/cnbm/packing/service/impl/ProductLevelServiceBizImpl.java Normal file
View File

@@ -0,0 +1,90 @@
package com.cnbm.packing.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.cnbm.admin.utils.BaseSupportUtils;
import com.cnbm.common.page.PageData;
import com.cnbm.common.service.impl.CrudServiceImpl;
import com.cnbm.common.utils.ConvertUtils;
import com.cnbm.packing.dto.ProductLevelDTO;
import com.cnbm.packing.entity.ProductLevel;
import com.cnbm.packing.mapper.ProductLevelMapper;
import com.cnbm.packing.service.ProductLevelServiceBiz;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
* 产品等级 表
*
* @author codeGenerator
* @since 2023-12-21
*/
@Service
public class ProductLevelServiceBizImpl extends CrudServiceImpl<ProductLevelMapper, ProductLevel, ProductLevelDTO> implements ProductLevelServiceBiz {
@Autowired
private ProductLevelMapper mapper;
@Override
public QueryWrapper<ProductLevel> getWrapper(Map<String, Object> params){
String id = (String)params.get("id");
QueryWrapper<ProductLevel> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), "id", id);
return wrapper;
}
@Override
public PageData<ProductLevelDTO> page (Map<String, Object> params){
IPage<ProductLevel> page = baseDao.selectPage(
getPage(params, ProductLevel.CREATE_TIME, false),
getWrapper(params)
);
return getPageData(page, ProductLevelDTO.class);
}
@Override
public ProductLevelDTO get(Long id) {
ProductLevel entity = baseDao.selectById(id);
return ConvertUtils.sourceToTarget(entity, ProductLevelDTO.class);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void save(ProductLevelDTO dto) {
ProductLevel entity = ConvertUtils.sourceToTarget(dto, ProductLevel.class);
BaseSupportUtils.setCommonField(entity);
insert(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(ProductLevelDTO dto) {
ProductLevel entity = ConvertUtils.sourceToTarget(dto, ProductLevel.class);
BaseSupportUtils.setUpdateCommonField(entity);
updateById(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(Long[] ids) {
//删除
deleteBatchIds(Arrays.asList(ids));
}
@Override
@Transactional(rollbackFor = Exception.class)
public List<ProductLevelDTO> list() {
List<ProductLevelDTO> list = mapper.list();
return list;
}
}

90
ym-packing/src/main/java/com/cnbm/packing/service/impl/ScenesServiceBizImpl.java Normal file
View File

@@ -0,0 +1,90 @@
package com.cnbm.packing.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.cnbm.admin.utils.BaseSupportUtils;
import com.cnbm.common.page.PageData;
import com.cnbm.common.service.impl.CrudServiceImpl;
import com.cnbm.common.utils.ConvertUtils;
import com.cnbm.packing.dto.ScenesDTO;
import com.cnbm.packing.entity.Scenes;
import com.cnbm.packing.mapper.ScenesMapper;
import com.cnbm.packing.service.ScenesServiceBiz;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
* 场景 表
*
* @author codeGenerator
* @since 2023-12-21
*/
@Service
public class ScenesServiceBizImpl extends CrudServiceImpl<ScenesMapper, Scenes, ScenesDTO> implements ScenesServiceBiz {
@Autowired
private ScenesMapper mapper;
@Override
public QueryWrapper<Scenes> getWrapper(Map<String, Object> params){
String id = (String)params.get("id");
QueryWrapper<Scenes> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), "id", id);
return wrapper;
}
@Override
public PageData<ScenesDTO> page (Map<String, Object> params){
IPage<Scenes> page = baseDao.selectPage(
getPage(params, Scenes.CREATE_TIME, false),
getWrapper(params)
);
return getPageData(page, ScenesDTO.class);
}
@Override
public ScenesDTO get(Long id) {
Scenes entity = baseDao.selectById(id);
return ConvertUtils.sourceToTarget(entity, ScenesDTO.class);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void save(ScenesDTO dto) {
Scenes entity = ConvertUtils.sourceToTarget(dto, Scenes.class);
BaseSupportUtils.setCommonField(entity);
insert(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(ScenesDTO dto) {
Scenes entity = ConvertUtils.sourceToTarget(dto, Scenes.class);
BaseSupportUtils.setUpdateCommonField(entity);
updateById(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(Long[] ids) {
//删除
deleteBatchIds(Arrays.asList(ids));
}
@Override
@Transactional(rollbackFor = Exception.class)
public List<ScenesDTO> list() {
List<ScenesDTO> list = mapper.list();
return list;
}
}

156
ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java
View File

@@ -140,6 +140,7 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBox
public WoPackagingBoxDTO printList(Long id) {
WoPackagingBox entity = baseDao.selectById(id);
WoPackagingBoxDTO dto = ConvertUtils.sourceToTarget(entity, WoPackagingBoxDTO.class);
matchColor(dto);
QueryWrapper<WoPackagingBoxSubstrate> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(entity.getBoxNo()), WoPackagingBoxSubstrate.PACKAGING_BOX_ID, entity.getBoxNo());
wrapper.orderByAsc(WoPackagingBoxSubstrate.SLOT);
@@ -249,4 +250,159 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBox
param);
return R.ok(iPage);
}
@Override
public void setColor(List<WoPackagingBoxDTO> list) {
list.forEach(e -> {
matchColor(e);
});
}
public void matchColor(WoPackagingBoxDTO dto) {
if (dto.getSapMaterial() != null) {
String[] sublist = dto.getSapMaterial().split("\\.");
if (sublist.length > 2) {
switch (sublist[2]) {
case "C0001":
dto.setColor("暗灰");
break;
case "C0002":
dto.setColor("暗蓝");
break;
case "C0003":
dto.setColor("暗绿");
break;
case "C0004":
dto.setColor("暗黄");
break;
case "C0005":
dto.setColor("暗橘黄");
break;
case "C0006":
dto.setColor("暗红");
break;
case "C0007":
dto.setColor("亮灰");
break;
case "C0008":
dto.setColor("亮蓝");
break;
case "C0009":
dto.setColor("亮绿");
break;
case "C0010":
dto.setColor("亮黄");
break;
case "C0011":
dto.setColor("亮橘黄");
break;
case "C0012":
dto.setColor("亮红");
break;
case "C0013":
dto.setColor("大红");
break;
case "C0014":
dto.setColor("中国红1185");
break;
case "C0015":
dto.setColor("新蓝825");
break;
case "C0016":
dto.setColor("橄榄绿1186");
break;
case "C0017":
dto.setColor("落日黄3726");
break;
case "C0018":
dto.setColor("玛瑙灰4023");
break;
case "C0019":
dto.setColor("中国红PV-748-R115");
break;
case "C0020":
dto.setColor("阳光橙PV-748-0M2");
break;
case "C0021":
dto.setColor("雪花银PV-748-W815");
break;
case "C0022":
dto.setColor("苍穹灰PV-748-GR960");
break;
case "C0023":
dto.setColor("阳光金PV-748-GL6020");
break;
case "C0024":
dto.setColor("锦缎金PV-748-GL920");
break;
case "C0025":
dto.setColor("森林绿PV-748-G830");
break;
case "C0026":
dto.setColor("恒星绿PV-748-G602");
break;
case "C0027":
dto.setColor("天空蓝PV-748-BL60");
break;
case "C0028":
dto.setColor("香芋紫PV-748-BL40");
break;
case "C0029":
dto.setColor("木槿紫PV-748-RZ92");
break;
case "C0030":
dto.setColor("日光红PV-748-R602");
break;
case "C0031":
dto.setColor("天空蓝BM0020");
break;
case "C0032":
dto.setColor("天蓝色BM0101");
break;
case "C0033":
dto.setColor("亮紫");
break;
case "C0034":
dto.setColor("荒漠迷彩");
break;
case "C0035":
dto.setColor("阳光金");
break;
case "C0036":
dto.setColor("天空蓝");
break;
case "C0037":
dto.setColor("翠绿色");
break;
case "C0038":
dto.setColor("苍穹灰");
break;
case "C0039":
dto.setColor("中国红-3");
break;
case "C0040":
dto.setColor("301中国红亮彩");
break;
case "C0041":
dto.setColor("淡金色");
break;
case "C0042":
dto.setColor("土耳其条纹黄玉大理石");
break;
case "C0043":
dto.setColor("意大利伯林顿灰大理石");
break;
case "C0044":
dto.setColor("黑色");
break;
case "C0045":
dto.setColor("50%透光黑色");
break;
default:
break;
}
}
}
}
}

151
ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxSubstrateServiceBizImpl.java
View File

@@ -28,6 +28,7 @@ import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* 包装箱基板关联表
@@ -230,4 +231,154 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl<WoPac
public int updatePackagingBoxIdAndSlotByWoSubstrateId(String packagingBoxId, Integer slot , String woSubstrateId) {
return mapper.updatePackagingBoxIdAndSlotByWoSubstrateId(packagingBoxId,slot,woSubstrateId);
}
@Override
public void setColor(List<WoPackagingBoxSubstrateDTO> list) {
list.forEach(e -> {
if(e.getSapMaterial()!=null){
String[] sublist = e.getSapMaterial().split("\\.");
if(sublist.length>2) {
switch (sublist[2]) {
case "C0001":
e.setColor("暗灰");
break;
case "C0002":
e.setColor("暗蓝");
break;
case "C0003":
e.setColor("暗绿");
break;
case "C0004":
e.setColor("暗黄");
break;
case "C0005":
e.setColor("暗橘黄");
break;
case "C0006":
e.setColor("暗红");
break;
case "C0007":
e.setColor("亮灰");
break;
case "C0008":
e.setColor("亮蓝");
break;
case "C0009":
e.setColor("亮绿");
break;
case "C0010":
e.setColor("亮黄");
break;
case "C0011":
e.setColor("亮橘黄");
break;
case "C0012":
e.setColor("亮红");
break;
case "C0013":
e.setColor("大红");
break;
case "C0014":
e.setColor("中国红1185");
break;
case "C0015":
e.setColor("新蓝825");
break;
case "C0016":
e.setColor("橄榄绿1186");
break;
case "C0017":
e.setColor("落日黄3726");
break;
case "C0018":
e.setColor("玛瑙灰4023");
break;
case "C0019":
e.setColor("中国红PV-748-R115");
break;
case "C0020":
e.setColor("阳光橙PV-748-0M2");
break;
case "C0021":
e.setColor("雪花银PV-748-W815");
break;
case "C0022":
e.setColor("苍穹灰PV-748-GR960");
break;
case "C0023":
e.setColor("阳光金PV-748-GL6020");
break;
case "C0024":
e.setColor("锦缎金PV-748-GL920");
break;
case "C0025":
e.setColor("森林绿PV-748-G830");
break;
case "C0026":
e.setColor("恒星绿PV-748-G602");
break;
case "C0027":
e.setColor("天空蓝PV-748-BL60");
break;
case "C0028":
e.setColor("香芋紫PV-748-BL40");
break;
case "C0029":
e.setColor("木槿紫PV-748-RZ92");
break;
case "C0030":
e.setColor("日光红PV-748-R602");
break;
case "C0031":
e.setColor("天空蓝BM0020");
break;
case "C0032":
e.setColor("天蓝色BM0101");
break;
case "C0033":
e.setColor("亮紫");
break;
case "C0034":
e.setColor("荒漠迷彩");
break;
case "C0035":
e.setColor("阳光金");
break;
case "C0036":
e.setColor("天空蓝");
break;
case "C0037":
e.setColor("翠绿色");
break;
case "C0038":
e.setColor("苍穹灰");
break;
case "C0039":
e.setColor("中国红-3");
break;
case "C0040":
e.setColor("301中国红亮彩");
break;
case "C0041":
e.setColor("淡金色");
break;
case "C0042":
e.setColor("土耳其条纹黄玉大理石");
break;
case "C0043":
e.setColor("意大利伯林顿灰大理石");
break;
case "C0044":
e.setColor("黑色");
break;
case "C0045":
e.setColor("50%透光黑色");
break;
default:
break;
}
}
}
});
}
}

24
ym-packing/src/main/resources/mapper/ProductLevelMapper.xml Normal file
View File

@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.cnbm.packing.mapper.ProductLevelMapper">
<resultMap type="com.cnbm.packing.entity.ProductLevel" id="ProductLevelMap">
<id column="id" property="id" />
<id column="product_name" property="productName" />
<id column="product_level" property="productLevel" />
<id column="remark" property="remark" />
<id column="valid" property="valid" />
<id column="creator_id" property="creatorId" />
<id column="creator_name" property="creatorName" />
<id column="create_time" property="createTime" />
<id column="updater_id" property="updaterId" />
<id column="updater_name" property="updaterName" />
<id column="update_time" property="updateTime" />
<id column="version" property="version" />
</resultMap>
<select id="list" resultType="com.cnbm.packing.dto.ProductLevelDTO">
select * from t_product_level
order by id asc
</select>
</mapper>

23
ym-packing/src/main/resources/mapper/ScenesMapper.xml Normal file
View File

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.cnbm.packing.mapper.ScenesMapper">
<resultMap type="com.cnbm.packing.entity.Scenes" id="ScenesMap">
<id column="id" property="id" />
<id column="scenes_name" property="scenesName" />
<id column="remark" property="remark" />
<id column="valid" property="valid" />
<id column="creator_id" property="creatorId" />
<id column="creator_name" property="creatorName" />
<id column="create_time" property="createTime" />
<id column="updater_id" property="updaterId" />
<id column="updater_name" property="updaterName" />
<id column="update_time" property="updateTime" />
<id column="version" property="version" />
</resultMap>
<select id="list" resultType="com.cnbm.packing.dto.ScenesDTO">
select * from t_scenes
order by id asc
</select>
</mapper>

2
ym-packing/src/main/resources/mapper/WoCompensationPowerMapper.xml
View File

@@ -6,7 +6,7 @@
<id column="actl_pmpp_low" property="actlPmppLow" />
<id column="actl_pmpp_high" property="actlPmppHigh" />
<id column="formula" property="formula" />
<id column="line_body" prope】/rty="lineBody" />
<id column="line_body" property="lineBody" />
<id column="coefficient_a" property="coefficientA" />
<id column="coefficient_b" property="coefficientB" />
<id column="remark" property="remark" />