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

板材、余料字段检验

Browse Source
This commit is contained in:
lym
2024-10-15 16:10:12 +08:00
parent 8b6232edbb 6f3bca28b7
commit e1aa577bc7
68 changed files with 674 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/api/plan/OrderPlanApi.java
+4
View File
@@ -25,6 +25,10 @@ public interface OrderPlanApi {
CommonResult<Boolean> getOrderPlan(@RequestParam("machineId") Long id);
@GetMapping(PREFIX +"/apiGetOrder")
@Operation(summary = "查询生产单对应的板材已全部开料")
@Parameter(name = "orderId", description = "生产单ID", required = true)
CommonResult<Boolean> getOrder(@RequestParam("orderId") Long orderId);
/*
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/api/plan/OrderPlanApiImpl.java
+16
View File
@@ -120,6 +120,22 @@ public class OrderPlanApiImpl implements OrderPlanApi{
}
@Override
public CommonResult<Boolean> getOrder(Long orderId) {
List<Long> planIds = goodsMapper.selectNoPlanOrders(orderId, getUserOrganId());
List<Long> planList = planIds.stream().filter(f -> f == 0).toList();
if(planIds.isEmpty() || !planList.isEmpty()){
return CommonResult.success(false);
}
List<Long> planIdList = planMapper.selectPLanList(planIds, getUserOrganId());
return CommonResult.success(planIdList.isEmpty());
}
/*
* 机台数据源数据查询
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/saveOptimize/BlockPlaceInfo.java
+2 -2
View File
@@ -15,9 +15,9 @@ public class BlockPlaceInfo {
private Long bi;
@Schema(description = "小板编号")
private Long bo;
private String bo;
public BlockPlaceInfo(Long bi, Long bo) {
public BlockPlaceInfo(Long bi, String bo) {
this.bi = bi;
this.bo = bo;
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/goods/GoodsMapper.java
+16
View File
@@ -212,5 +212,21 @@ public interface GoodsMapper extends BaseMapperX<GoodsDO> {
List<Long> selectNoPlanOrdersList(@Param("orderIds") List<Long> orderIds, @Param("organId") Long organId);
List<Long> selectNoPlanOrders(@Param("orderId") Long orderId, @Param("organId") Long organId);
default List<GoodsDO> selectNoPlanOrdersListByOrderIds(List<Long> orderIds, Long organId) {
return selectList(new LambdaQueryWrapperX<GoodsDO>()
.eq(GoodsDO::getOrganId, organId)
.eq(GoodsDO::getDeleted, false)
.inIfPresent(GoodsDO::getOrderId,orderIds)
.eq(GoodsDO::getPlanId,0)
.select(GoodsDO::getOrderId));
}
List<Long> selectOrderPlanList(@Param("orderIds") List<Long> orderIds,@Param("organId") Long organId);
List<Long> selectPlanOrderListByOrderIds(@Param("orderIds") List<Long> orderIds,@Param("organId") Long organId);
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java
+17 -3
View File
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.cf.imes.framework.common.enums.OrderPackageStatusEnum;
import com.cf.imes.framework.common.pojo.PageResult;
import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX;
import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX;
@@ -259,12 +260,25 @@ public interface OrderMapper extends BaseMapperX<OrderDO> {
default List<OrderDO> selectNoPlanOrderList(Long organId, List<Integer> statusList) {
default List<OrderDO> selectOrderList(List<Long> orderIds, Long organId) {
return selectList(new LambdaQueryWrapperX<OrderDO>()
.eqIfPresent(OrderDO::getOrganId, organId)
.eq(OrderDO::getDeleted, false)
.in(OrderDO::getStatus,statusList)
.select(OrderDO::getId));
.inIfPresent(OrderDO::getId,orderIds)
.eq(OrderDO::getStatus, OrderStatusEnum.FINISH_PRODUCTION.getStatus()));
}
default List<OrderDO> selectOrderPackList(List<Long> orderIds, Long organId) {
return selectList(new LambdaQueryWrapperX<OrderDO>()
.eqIfPresent(OrderDO::getOrganId, organId)
.eq(OrderDO::getDeleted, false)
.inIfPresent(OrderDO::getId,orderIds)
.eq(OrderDO::getPackaged, OrderPackageStatusEnum.PACKAGED.getStatus()));
}
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plan/PlanMapper.java
+9 -1
View File
@@ -5,7 +5,10 @@ import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX;
import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.cf.imes.framework.mybatis.core.query.MPJLambdaWrapperX;
import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderStatisticsReqVO;
import com.cf.imes.module.executor.controller.admin.plan.vo.*;
import com.cf.imes.module.executor.controller.admin.plan.vo.OrderPlanStatisticsAreaRespVO;
import com.cf.imes.module.executor.controller.admin.plan.vo.OrderPlanStatisticsCountRespVO;
import com.cf.imes.module.executor.controller.admin.plan.vo.PlanPageReqVO;
import com.cf.imes.module.executor.controller.admin.plan.vo.PlateOptimize;
import com.cf.imes.module.executor.dal.dataobject.goods.GoodsDO;
import com.cf.imes.module.executor.dal.dataobject.order.OrderDO;
import com.cf.imes.module.executor.dal.dataobject.plan.PlanDO;
@@ -117,6 +120,11 @@ public interface PlanMapper extends BaseMapperX<PlanDO> {
List<Long> selectPLanList(@Param("planIds") List<Long> planIds, @Param("organId") Long organId);
// List<PlanDO> seleTestSQL(@Param("sql") String sql);
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java
+9 -2
View File
@@ -162,7 +162,7 @@ public interface PlateMapper extends BaseMapperX<PlateDO> {
default List<PlateDO> selectPlateByPlateNo(List<Long> plateNo, Long organId) {
default List<PlateDO> selectPlateByPlateNo(List<String> plateNo, Long organId) {
return selectList(new LambdaQueryWrapperX<PlateDO>()
.eq(PlateDO::getOrganId,organId)
.eq(PlateDO::getDeleted,false)
@@ -237,7 +237,14 @@ public interface PlateMapper extends BaseMapperX<PlateDO> {
}
// List<PlateDO> selectTestSQL(@Param("sql") String sql);
default PlateDO selectByPlateNo(Long plateNo, Long organId) {
return selectOne(new LambdaQueryWrapperX<PlateDO>()
.eq(PlateDO::getOrganId,organId)
.eq(PlateDO::getDeleted,false)
.eq(PlateDO::getPlateNo, plateNo));
}
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java
+62 -12
View File
@@ -8,6 +8,7 @@ import co.elastic.clients.elasticsearch.ElasticsearchClient;
import co.elastic.clients.elasticsearch._types.FieldValue;
import co.elastic.clients.elasticsearch.core.*;
import co.elastic.clients.elasticsearch.core.search.Hit;
import com.alibaba.fastjson.JSON;
import com.cf.imes.framework.common.enums.OrderStatusEnum;
import com.cf.imes.framework.common.enums.PlanStatusEnum;
import com.cf.imes.framework.common.exception.ServiceException;
@@ -41,6 +42,7 @@ import com.cf.imes.module.executor.enums.ErrorCodeConstants;
import com.cf.imes.module.system.api.dataSource.DataSourceApi;
import com.cf.imes.module.system.api.machine.MachineApi;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
@@ -56,6 +58,7 @@ import java.util.stream.Stream;
import static com.cf.imes.framework.common.exception.enums.GlobalErrorCodeConstants.*;
import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.cf.imes.framework.common.util.json.JsonUtils.parseObject;
import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId;
import static com.cf.imes.module.executor.enums.ErrorCodeConstants.ORDER_NOT_EXISTS;
import static com.cf.imes.module.executor.enums.ErrorCodeConstants.PLAN_NOT_EXISTS;
@@ -159,7 +162,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
}
List<Long> plateNo = new ArrayList<>();
List<String> plateNo = new ArrayList<>();
// 创建一个列表存储 BlockPlaceInfo 对象,将优化的小板信息拿出，获取到小板编号，查询生产单，修改生产单的状态
List<BlockPlaceInfo> outputList = new ArrayList<>();
@@ -174,7 +177,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
if (jsonArray.isArray()) {
for (JsonNode jsonNode : jsonArray) {
Long bi = jsonNode.get("bi").asLong();
Long bo = jsonNode.get("bo").asLong();
String bo = jsonNode.get("bo").asText();
outputList.add(new BlockPlaceInfo(bi,bo));
}
}
@@ -191,8 +194,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
List<PlateDO> plateDOS = plateMapper.selectPlateByPlateNo(plateNo.stream().distinct().toList(), getUserOrganId());
List<Long> orderIds = plateDOS.stream().map(PlateDO::getOrderId).distinct().toList();
List<Long> orderIds = new ArrayList<>(plateDOS.stream().map(PlateDO::getOrderId).distinct().toList());
// 修改生产单的状态
@@ -203,7 +205,6 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
// 获取原排单的开料大板数 + 新增的开料大板数
long cutedBoardNumber = cutedBoardInfo.getCutedBoardNumber() == null ? 0 : cutedBoardInfo.getCutedBoardNumber();
// 获取原排单的已开料的大板编号
@@ -217,7 +218,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
goodsNo.stream().filter(str -> !cutedBoardList.contains(str)))
.toList());
cutedBoardNumber = cutedBoardList.size();
long cutedBoardNumber = cutedBoardList.size();
// 将需要更新更新的数据更新到原数据中
cutedBoardInfo.setCutedBoardNumber(cutedBoardNumber);
@@ -251,6 +252,23 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
planMapper.updateById(planDO);
List<Long> deleteOrderIds = goodsMapper.selectNoPlanOrdersListByOrderIds(orderIds, getUserOrganId()).stream().map(GoodsDO::getOrderId).distinct().toList();
orderIds.removeAll(deleteOrderIds);
if(!orderIds.isEmpty()) {
List<Long> orderIdList = goodsMapper.selectOrderPlanList(orderIds, getUserOrganId());
List<OrderDO> orderDOS = orderMapper.selectOrderPackList(orderIdList, getUserOrganId());
if (!orderDOS.isEmpty()) {
List<OrderDO> orderDOList = orderDOS.stream().map(m -> m.setStatus(OrderStatusEnum.FINISH_PRODUCTION.getStatus())).toList();
orderMapper.updateBatch(orderDOList);
}
}
}
return Boolean.TRUE;
@@ -319,16 +337,48 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
if(cutedBoardInfo.getCutedBoardNumber() == 0){
// planDO.setStatus(PlanStatusEnum.NOCUTTING.getStatus());
// planDO.setProduceTime(null);
planMapper.updatePlanStatus(planId,PlanStatusEnum.NOCUTTING.getStatus(),getUserOrganId());
List<Long> orderIdList = JSON.parseArray(planDO.getOrderNos()).toJavaList(Long.class);
orderIdList.removeAll(goodsMapper.selectPlanOrderListByOrderIds(orderIdList,getUserOrganId()));
if(!orderIdList.isEmpty()) {
List<OrderDO> orderDOList = orderMapper.selectBatchIds(orderIdList);
orderMapper.updateBatch(orderDOList.stream()
.map(m -> m.setStatus(OrderStatusEnum.SORTED.getStatus()))
.toList());
}
return Boolean.TRUE;
}
if(planDO.getStatus().equals(PlanStatusEnum.OPENED.getStatus()) && cutedBoardInfo.getCutedBoardNumber() > 0 && cutedBoardInfo.getCutedBoardNumber() < optimizeBoardModelDO.getBoardCount() ){
// planDO.setStatus(PlanStatusEnum.OPENING.getStatus());
// planDO.setProduceTime(null);
planMapper.updatePlanStatus(planId,PlanStatusEnum.OPENING.getStatus(),getUserOrganId());
// if(planDO.getStatus().equals(PlanStatusEnum.OPENED.getStatus()) && cutedBoardInfo.getCutedBoardNumber() > 0 && cutedBoardInfo.getCutedBoardNumber() < optimizeBoardModelDO.getBoardCount() ){
//
// planMapper.updatePlanStatus(planId,PlanStatusEnum.OPENING.getStatus(),getUserOrganId());
// }
planMapper.updatePlanStatus(planId,PlanStatusEnum.OPENING.getStatus(),getUserOrganId());
// 判断取消开料的大板对应的生产单号的状态，修改状态
List<PlatePlaceInfo> asJsonObject = parseObject(optimizeBoardModelDO.getBlockPlaceInfo(), new TypeReference<>() {});
List<String> plateNo = new ArrayList<>();
for (Long aLong : goodsNo) {
plateNo.addAll(asJsonObject.stream().filter(f->f.getBi().equals(aLong)).map(PlatePlaceInfo::getBo).toList());
}
List<Long> orderIds = plateMapper.selectPlateByPlateNo(plateNo, getUserOrganId()).stream().map(PlateDO::getOrderId).toList();
List<OrderDO> orderDOS = orderMapper.selectOrderList(orderIds, getUserOrganId());
if(!orderDOS.isEmpty()){
List<OrderDO> orderDOList = orderDOS.stream().map(m -> m.setStatus(OrderStatusEnum.IN_PRODUCTION.getStatus())).toList();
orderMapper.updateBatch(orderDOList);
}
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java
+8 -2
View File
@@ -197,10 +197,16 @@ public class PlanServiceImpl implements PlanService {
List<OrderDO> orderDOList = orderMapper.selectBatchIds(orderIdList);
orderDOList.forEach(m -> m.setStatus(OrderStatusEnum.SORTED.getStatus()));
List<OrderDO> orderDOS = orderDOList.stream()
.filter(f -> !f.getStatus().equals(OrderStatusEnum.IN_PRODUCTION.getStatus()))
.map(m -> m.setStatus(OrderStatusEnum.SORTED.getStatus()))
.toList();
orderMapper.updateBatch(orderDOList);
// orderDOList.forEach(m -> m.setStatus(OrderStatusEnum.SORTED.getStatus()));
if(!orderDOS.isEmpty()) {
orderMapper.updateBatch(orderDOS);
}
planMapper.insertBatch(planDOS);
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java
+14 -9
View File
@@ -14,7 +14,6 @@ import com.cf.imes.framework.common.exception.ServiceException;
import com.cf.imes.framework.common.exception.util.ServiceExceptionUtil;
import com.cf.imes.framework.common.pojo.PageResult;
import com.cf.imes.framework.common.util.Assert.AssertUtils;
import com.cf.imes.framework.common.util.json.JsonUtils;
import com.cf.imes.framework.common.util.object.BeanUtils;
import com.cf.imes.framework.es.core.service.ESDocumentService;
import com.cf.imes.framework.mybatis.core.query.MPJLambdaWrapperX;
@@ -40,8 +39,6 @@ import com.cf.imes.module.executor.service.plan.PlanService;
import com.cf.imes.module.executor.util.fileConversion.admin.SnowflakeIdWorker3rd;
import com.cf.imes.module.system.enums.ErrorCodeConstants;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -56,6 +53,8 @@ import java.util.stream.Collectors;
import static com.cf.imes.framework.common.exception.enums.GlobalErrorCodeConstants.ES_ERROR_UPDATE;
import static com.cf.imes.framework.common.exception.enums.GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR;
import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.cf.imes.framework.common.util.json.JsonUtils.parseObject;
import static com.cf.imes.framework.common.util.json.JsonUtils.toJsonString;
import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId;
import static com.cf.imes.module.executor.service.optimizeplan.OptimizePlanService.ORDER_PLATE_MODEL;
import static com.cf.imes.module.system.enums.ErrorCodeConstants.*;
@@ -144,17 +143,19 @@ public class PlateServiceImpl implements PlateService {
try {
ObjectMapper mapper = new ObjectMapper();
// ObjectMapper mapper = new ObjectMapper();
//
// // 解析 JSON 字符串
// JsonNode jsonNode = mapper.readTree(optimizeBoardModelDO.getBlockPlaceInfo());
// List<PlatePlaceInfo> asJsonObject = mapper.convertValue(jsonNode, new TypeReference<>() {});
// 解析 JSON 字符串
JsonNode jsonNode = mapper.readTree(optimizeBoardModelDO.getBlockPlaceInfo());
Long placeBlockNumber = optimizeBoardModelDO.getPlaceBlockNumber() - 1;
List<PlatePlaceInfo> asJsonObject = mapper.convertValue(jsonNode, new TypeReference<>() {});
List<PlatePlaceInfo> asJsonObject = parseObject(optimizeBoardModelDO.getBlockPlaceInfo(), new TypeReference<>() {});
String blockPlaceInfo = JsonUtils.toJsonString(
String blockPlaceInfo = toJsonString(
asJsonObject.stream()
.filter(f -> !f.getBo().equals(plateDO.getPlateNo()))
.toList());
@@ -338,6 +339,10 @@ public class PlateServiceImpl implements PlateService {
AssertUtils.notEmpty(reqVO.getBodyId(),ORDER_BODY_ERROR);
AssertUtils.notEmpty(reqVO.getOrderId(),ORDER_ERROR);
if(reqVO.getMultiple() < 1 ){
throw exception(PLATE_MULTIPLE_ERROR);
}
GoodsDO goodsDO = goodsMapper.selectGoodsId(reqVO.getOrderId(), reqVO.getGoodsId(), getUserOrganId());
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/goods/GoodsMapper.xml
+47
View File
@@ -443,5 +443,52 @@
</select>
<select id="selectNoPlanOrders" resultType="java.lang.Long">
select distinct plan_id
from order_goods
where organ_id = #{organId}
and deleted = false
and order_id = #{orderId};
</select>
<select id="selectOrderPlanList" resultType="java.lang.Long">
select distinct og.order_id
from order_goods og
left join order_plan op on og.organ_id = op.organ_id and og.deleted = op.deleted and og.plan_id = op.id
where og.organ_id = #{organId}
and og.deleted = false
and og.order_id in
<foreach item="orderIds" collection="orderIds" open="(" separator="," close=")">
#{orderIds}
</foreach>
and op.status = 2
</select>
<select id="selectPlanOrderListByOrderIds" resultType="java.lang.Long">
select distinct og.order_id
from order_goods og
left join order_plan op on og.organ_id = op.organ_id and og.deleted = op.deleted and og.plan_id = op.id
where og.organ_id = #{organId}
and og.deleted = false
and og.order_id in
<foreach item="orderIds" collection="orderIds" open="(" separator="," close=")">
#{orderIds}
</foreach>
and op.status in (1,2)
</select>
</mapper>
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plan/PlanMapper.xml
+14
View File
@@ -122,6 +122,20 @@
and status !=0;
</select>
<select id="selectPLanList" resultType="java.lang.Long">
select id
from order_plan
where organ_id = #{organId}
and deleted = false
and id in
<foreach item="planIds" collection="planIds" open="(" separator="," close=")">
#{planIds}
</foreach>
and status in (0,1);
</select>