Browse Source

2024-04-29 计划录入增加重复验证接口

master_hella_20240701
zhousq 1 year ago
parent
commit
29ab098d27
  1. 3
      win-module-mes/win-module-mes-api/src/main/java/com/win/module/mes/enums/ErrorCodeConstants.java
  2. 8
      win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/controller/mesorderday/MesOrderDayController.java
  3. 2
      win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/service/mesorderday/MesOrderDayService.java
  4. 12
      win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/service/mesorderday/MesOrderDayServiceImpl.java

3
win-module-mes/win-module-mes-api/src/main/java/com/win/module/mes/enums/ErrorCodeConstants.java

@ -48,6 +48,8 @@ public interface ErrorCodeConstants {
ErrorCode PLAN_SCHEDULED_EXISTS = new ErrorCode(1_006_000_034, "计划已经排产,不能重复排产!");
ErrorCode PLAN_START_ALREADY_CANNOT_BE_TERMINATE = new ErrorCode(1_006_000_035, "计划已经开工,不能被终止!请先终止所有开工的工单!");
ErrorCode REPORTP_STORE_NOT_EXISTS = new ErrorCode(1_006_000_036, "报工库存记录不存在!");
ErrorCode ORDER_DAY_IS_EXISTS = new ErrorCode(1_006_000_037, "已经存在相同日计划!");
// ========== 能力配置 1-006-001-000 ==========
ErrorCode ABILITY_INFO_LIST_IS_EMPTY = new ErrorCode(1_006_001_001, "能力矩阵信息不存在!");
ErrorCode ABILITY_INFO_IS_EXIT = new ErrorCode(1_006_001_002, "已存在能力矩阵编码!");
@ -82,6 +84,7 @@ public interface ErrorCodeConstants {
ErrorCode HOLIDAY_SETTING_NOT_EXISTS = new ErrorCode(1_006_003_001, "节假日不存在!");
ErrorCode HOLIDAY_SETTING_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_006_003_002, "节假日导入数据内容为空!");
// ========== 质检 1-006-004-000 ==========
ErrorCode QUALITYCLASS_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_006_004_001, "质量类别基本信息不存在");
ErrorCode QUALITYCLASS_LIST_IS_EXIT = new ErrorCode(1_006_004_002, "已存在质量类别编码");

8
win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/controller/mesorderday/MesOrderDayController.java

@ -89,7 +89,13 @@ public class MesOrderDayController {
createReqVO.setPlanNoDay(billNo);
createReqVO.setStatus(PlanBillStatusEnum.WAITSECHUDLE.getCode());//待排产
createReqVO.setBatchCode(Optional.ofNullable(createReqVO.getBatchCode()).orElse(billNo));//批次号
return success(orderDayService.createOrderDay(createReqVO));
MesOrderDayDO orderDayOne = orderDayService.getOrderDayOne(createReqVO,true);
if(StringUtils.isNotNull(orderDayOne)){
return error(ErrorCodeConstants.ORDER_DAY_IS_EXISTS);
}else{
return success(orderDayService.createOrderDay(createReqVO));
}
}
@PutMapping("/update")

2
win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/service/mesorderday/MesOrderDayService.java

@ -43,7 +43,7 @@ public interface MesOrderDayService {
* @return 生产日计划
*/
MesOrderDayDO getOrderDay(Long id);
MesOrderDayDO getOrderDayOne( MesOrderDayCreateReqVO createReqVO,boolean ignoreBillNo);
/**
* 获得生产日计划列表
*

12
win-module-mes/win-module-mes-biz/src/main/java/com/win/module/mes/service/mesorderday/MesOrderDayServiceImpl.java

@ -6,6 +6,8 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.UUID;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.win.module.mes.controller.mesorderday.vo.*;
import com.win.module.mes.dal.dataobject.mesorderdaybom.MesOrderDayBomDO;
import com.win.module.mes.dal.dataobject.mesorderdayequipment.MesOrderDayEquipmentDO;
@ -132,7 +134,17 @@ public class MesOrderDayServiceImpl implements MesOrderDayService {
public MesOrderDayDO getOrderDay(Long id) {
return orderDayMapper.selectById(id);
}
@Override
public MesOrderDayDO getOrderDayOne( MesOrderDayCreateReqVO createReqVO,boolean ignoreBillNo){
MesOrderDayDO convert = MesOrderDayConvert.INSTANCE.convert(createReqVO);
if(ignoreBillNo){
convert.setPlanNoDay(null);
}
QueryWrapper<MesOrderDayDO> queryWrapper=new QueryWrapper<MesOrderDayDO>();
queryWrapper.setEntity(convert);
return orderDayMapper.selectOne(queryWrapper);
}
@Override
public List<MesOrderDayDO> getOrderDayList(Collection<Long> ids) {
return orderDayMapper.selectBatchIds(ids);

Loading…
Cancel
Save