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-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

组织机台授权新增最大数量异常信息提示，排单优化生产ES数据结构余料新增品牌等信息

Browse Source
This commit is contained in:
liuzhaotian
2024-09-29 14:45:03 +08:00
parent 6d8af55a69
commit eeafc5f2a6
8 changed files with 66 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/saveOptimize/RemainBoardList.java
+14 -1
View File
@@ -45,7 +45,7 @@ public class RemainBoardList {
@Schema(description = "纹路 纹路(0正纹1可翻转2反纹)")
private Integer texture;
private Boolean texture;
@@ -53,4 +53,17 @@ public class RemainBoardList {
private Boolean isHandAdd;
@Schema(description = "品牌", requiredMode = Schema.RequiredMode.REQUIRED)
private String brand;
@Schema(description = "仓库", requiredMode = Schema.RequiredMode.REQUIRED)
private String store;
@Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED)
private String remark;
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java
+14
View File
@@ -170,6 +170,13 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
OptimizeBoardModelDO optimizeBoardModelDO = optimizeBoardModelDOS.get(0);
if(!optimizeBoardModelDO.getIsOptimized()){
throw exception(ORDER_PLAN_NO_OPTIMIZE_ERROR);
}
List<Long> plateNo = new ArrayList<>();
// 创建一个列表存储 BlockPlaceInfo 对象,将优化的小板信息拿出，获取到小板编号，查询生产单，修改生产单的状态
@@ -288,6 +295,13 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
OptimizeBoardModelDO optimizeBoardModelDO = optimizeBoardModelDOS.get(0);
if(!optimizeBoardModelDO.getIsOptimized()){
throw exception(ORDER_PLAN_NO_OPTIMIZE_UPDATE_ERROR);
}
CutedBoardInfo cutedBoardInfo = optimizeBoardModelDO.getCutedBoardInfo() == null ? new CutedBoardInfo() : optimizeBoardModelDO.getCutedBoardInfo();
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml
+2 -4
View File
@@ -44,8 +44,8 @@
o.status as status
from orders o
STRAIGHT_JOIN order_goods og on o.organ_id = og.organ_id and o.id = og.order_id and og.plan_id = 0 and o.deleted = og.deleted
STRAIGHT_JOIN order_plate op on o.organ_id = op.organ_id and o.deleted = op.deleted and o.id = op.order_id and op.is_optimized = false and og.id = op.goods_id
join order_goods og on o.organ_id = og.organ_id and o.id = og.order_id and og.plan_id = 0 and o.deleted = og.deleted
join order_plate op on o.organ_id = op.organ_id and o.deleted = op.deleted and o.id = op.order_id and op.is_optimized = false and og.id = op.goods_id
${ew.customSqlSegment}
@@ -240,8 +240,6 @@
select distinct
-- og.order_id as orderId,
-- og.id as id,
og.goods_id as goodsId,
og.goods_name,
cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java
+3
View File
@@ -217,6 +217,7 @@ public interface ErrorCodeConstants {
ErrorCode LABELINGMACHINE_RELATED_DATA_ERROR = new ErrorCode(1_002_029_014, "当前机台关联的贴标机数据有误，请在高级配置中重新配置贴标机或选择其他模板");
ErrorCode DRILLMACHINE_RELATED_DATA_ERROR = new ErrorCode(1_002_029_015, "当前机台关联的钻孔机数据有误，请在钻孔模块中重新配置钻孔机或选择其他模板");
ErrorCode MACHINE_DATA_ERROR = new ErrorCode(1_002_029_016, "当前组织还未进行机台授权，请联系组织管理员在基础管理里对当前组织进行机台授权，或联系客服进行授权");
ErrorCode MACHINE_NUM_DATA_ERROR = new ErrorCode(1_002_029_017, "组织授权的机台数量不能超过127台");
// ========== 标签模板 1-002-300-000 ==========
@@ -299,6 +300,8 @@ public interface ErrorCodeConstants {
ErrorCode ORDER_GOODS_DATA_ERROR = new ErrorCode(1_002_041_010, "当前大板数据异常，请检查大板信息或者联系客服");
ErrorCode ORDER_PACK_DATA_ERROR = new ErrorCode(1_002_041_011, "当前包裹数据为空，请重新查看包裹数据或联系客服");
ErrorCode ORDER_BODY_DATA_ERROR = new ErrorCode(1_002_041_012, "当前柜体对应的板材数据为空，无法删除");
ErrorCode ORDER_PLAN_NO_OPTIMIZE_ERROR = new ErrorCode(1_002_041_013, "当前排单还未保存优化结果，无法进行开料");
ErrorCode ORDER_PLAN_NO_OPTIMIZE_UPDATE_ERROR = new ErrorCode(1_002_041_014, "当前排单还未保存优化结果，无法对开料结果进行修改");
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/datasource/DataSourceController.java
+4 -4
View File
@@ -76,7 +76,7 @@ public class DataSourceController {
}*/
@GetMapping("/list")
@Operation(summary = "获得系统数据源列表")
@Operation(summary = "获得系统数据源列表-获取标签数据源")
//@PreAuthorize("@ss.hasPermission('system:data-source:query')")
public CommonResult<List<DataSourceRespVO>> list( ) {
return success(dataSourceService.list());
@@ -99,17 +99,17 @@ public class DataSourceController {
@GetMapping("/getList")
@Operation(summary = "获取数据源参数")
@Operation(summary = "获取数据源参数-获取机台数据源")
@Parameter(name = "type", description = "标签类型", required = true, example = "9")
//@PreAuthorize("@ss.hasPermission('system:data-source:query')")
public CommonResult<List<DataSourceFiledReqVO>> getList(@RequestParam("type") Integer type ) {
return success(dataSourceService.getList( type));
return success(dataSourceService.getList(type));
}
@GetMapping("/getKeyNameData")
@Operation(summary = "数据源对应字段数据查询")
@Operation(summary = "机台数据源对应字段数据查询")
@Parameters({
@Parameter(name = "machineId", description = "机台ID", required = true),
@Parameter(name = "planId", description = "排单ID", required = true)
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineController.java
+2 -3
View File
@@ -6,7 +6,6 @@ import com.cf.imes.framework.common.util.object.BeanUtils;
import com.cf.imes.framework.es.core.valid.CreateGroup;
import com.cf.imes.framework.es.core.valid.UpdateGroup;
import com.cf.imes.framework.operatelog.core.annotations.OperateLog;
import com.cf.imes.framework.organ.core.context.OrganContextHolder;
import com.cf.imes.module.system.controller.admin.machine.vo.*;
import com.cf.imes.module.system.dal.dataobject.machine.MachineDO;
import com.cf.imes.module.system.service.machine.MachineService;
@@ -110,8 +109,8 @@ public class MachineController {
@GetMapping(value = {"/list-all-simple", "/simple-list"})
@Operation(summary = "获取机台精简信息列表", description = "主要用于前端的下拉选项")
public CommonResult<List<MachineSimpleRespVO>> getSimpleDeptList(@RequestParam(required = false) Long organId,@RequestParam(required = false) Long type) {
organId = organId == null ? OrganContextHolder.getOrganId() : organId;
List<MachineSimpleRespVO> list = machineService.simpleList(organId,type);
// organId = organId == null ? OrganContextHolder.getOrganId() : organId;
List<MachineSimpleRespVO> list = machineService.simpleList(type);
return success(list);
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineService.java
+1 -1
View File
@@ -80,7 +80,7 @@ public interface MachineService {
PageResult<MachineDO> page(MachinePageReqVO pageParam);
List<MachineSimpleRespVO> simpleList(Long organId,Long type);
List<MachineSimpleRespVO> simpleList(Long type);
List<MachineBrandModelRespVO> getBrandAndModel(Integer type);
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java
+26 -5
View File
@@ -443,12 +443,26 @@ public class MachineServiceImpl implements MachineService {
@Override
public Boolean authInsert(MachineOrgAuthReq vo) {
OrganizationDO tenant = organMapper.selectById(vo.getOrganId());
if (tenant == null) {
throw exception(ORGAN_NOT_EXISTS);
}
MachineLimitDO machineLimit = machineLimitMapper.selectById(vo.getOrganId());
if (machineLimit != null) {
throw exception(ORGAN_ALREADY_EXISTS);
}
Integer[] limits = {vo.getCutLimit(), vo.getDrillLimit(), vo.getLabelLimit(), vo.getSawLimit(), vo.getSealedgeLimit()};
for (Integer limit : limits) {
if (limit > 127) {
throw exception(MACHINE_NUM_DATA_ERROR);
}
}
MachineLimitDO machineLimitDO = MachineLimitDO.builder()
.organId(vo.getOrganId())
.cutLimit(vo.getCutLimit())
@@ -456,7 +470,6 @@ public class MachineServiceImpl implements MachineService {
.labelLimit(vo.getLabelLimit())
.sawLimit(vo.getSawLimit())
.sealedgeLimit(vo.getSealedgeLimit())
// .setting(vo.getMachineAuthIds().toString())
.build();
machineLimitMapper.insert(machineLimitDO);
@@ -473,6 +486,16 @@ public class MachineServiceImpl implements MachineService {
throw exception(ORGAN_NOT_EXISTS);
}
Integer[] limits = {vo.getCutLimit(), vo.getDrillLimit(), vo.getLabelLimit(), vo.getSawLimit(), vo.getSealedgeLimit()};
for (Integer limit : limits) {
if (limit > 127) {
throw exception(MACHINE_NUM_DATA_ERROR);
}
}
LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
assert loginUser != null;
@@ -483,8 +506,6 @@ public class MachineServiceImpl implements MachineService {
.labelLimit(vo.getLabelLimit())
.sawLimit(vo.getSawLimit())
.sealedgeLimit(vo.getSealedgeLimit())
// .setting(vo.getMachineAuthIds().toString())
.build();
machineLimitDO.setUpdateTime(LocalDateTime.now());
@@ -537,9 +558,9 @@ public class MachineServiceImpl implements MachineService {
@Override
@OrganIgnore
public List<MachineSimpleRespVO> simpleList(Long organId, Long type) {
public List<MachineSimpleRespVO> simpleList( Long type) {
List<MachineDO> machineDOS = machineMapper.selectList(new LambdaQueryWrapperX<MachineDO>()
.eqIfPresent(MachineDO::getOrganId, organId)
.eqIfPresent(MachineDO::getOrganId, getUserOrganId())
.eqIfPresent(MachineDO::getMachineType, type)
.select(MachineDO::getId, MachineDO::getName, MachineDO::getMachineType)
);