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

新增自增板逻辑更改，token导出去除*号，token请求头校验增加

Browse Source
This commit is contained in:
liuzhaotian
2025-03-08 14:29:38 +08:00
parent 34cacc6d51
commit caa5743503
12 changed files with 116 additions and 68 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/plate/vo/InsertPlateRespVO.java
+3 -2
View File
@@ -7,7 +7,7 @@ import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
import java.util.Map;
@Data
@Builder
@@ -21,7 +21,8 @@ public class InsertPlateRespVO {
@Schema(description = "新增的小板编号")
private List<String> plateNo;
// 小板ID，小板编号
private Map<String,String> plateNo;
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/goods/GoodsMapper.java
+9 -2
View File
@@ -18,6 +18,7 @@ import com.cf.imes.module.executor.dal.dataobject.goods.GoodsDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.math.BigDecimal;
import java.util.Collection;
import java.util.List;
@@ -191,12 +192,18 @@ public interface GoodsMapper extends BaseMapperX<GoodsDO> {
List<OrderGoodsPlateIds> selectPlateGoodIds(@Param("orderIds") List<Long> orderIds, @Param("organId") Long organId);
default List<GoodsDO> selectOrderGoodsList(List<Long> orderIds, List<String> goodsIds, Long organId) {
default List<GoodsDO> selectOrderGoodsList(List<Long> orderIds,
List<String> goodsIds,
String material,
BigDecimal thickness,
Long organId) {
return selectList(new LambdaQueryWrapperX<GoodsDO>()
.eq(GoodsDO::getOrganId, organId)
.eq(GoodsDO::getDeleted, false)
.inIfPresent(GoodsDO::getOrderId,orderIds)
.inIfPresent(GoodsDO::getGoodsId,goodsIds));
.inIfPresent(GoodsDO::getGoodsId,goodsIds)
.eqIfPresent(GoodsDO::getMaterial,material)
.eqIfPresent(GoodsDO::getThickness,thickness));
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/planitem/PlanItemMapper.java
+8
View File
@@ -78,4 +78,12 @@ public interface PlanItemMapper extends BaseMapperX<PlanItemDO> {
Long selectIsCuttingPlate(@Param("planId") Long planId,@Param("organId") Long organId);
default List<PlanItemDO> selectPlanOrderGoodsList(Long planId, List<Long> orderIds,Long organId) {
return selectList( new LambdaQueryWrapperX<PlanItemDO>()
.eq(PlanItemDO::getOrganId, organId)
.eq(PlanItemDO::getPlanId,planId)
.inIfPresent(PlanItemDO::getOrderId,orderIds)
.select(PlanItemDO::getGoodsId));
}
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java
+4 -2
View File
@@ -1657,7 +1657,8 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
orderDOS.forEach(f->f.setStatus(OrderStatusEnum.IN_PRODUCTION.getStatus()));
planMapper.updateById(planDO);
planMapper.updatePlanStatus(planDO.getId(),planDO.getStatus(),getUserOrganId());
orderMapper.updateBatch(orderDOS);
return;
@@ -1717,7 +1718,8 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
}
planMapper.updateById(planDO);
planMapper.updatePlanStatus(planDO.getId(),planDO.getStatus(),getUserOrganId());
List<PlateDO> plateDOS = plateMapper.selectPlateIsCuttingStatus(orderIds, getUserOrganId());
List<Long> orderIdList = plateDOS.stream().map(PlateDO::getOrderId).distinct().toList();
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java
+1 -5
View File
@@ -352,12 +352,8 @@ public class PlanServiceImpl implements PlanService {
if (!plateDOS.isEmpty()) {
List<Long> plateIdList = plateDOS.stream().map(PlateDO::getId).toList();
List<Long> goodsIds = plateDOS.stream().map(PlateDO::getGoodsId).toList();
plateMapper.deleteBatchIds(plateIdList);
goodsMapper.deleteBatchIds(goodsIds);
orderItemMapper.delete(new LambdaQueryWrapperX<OrderItemDO>()
.eq(OrderItemDO::getOrganId, getUserOrganId())
.inIfPresent(OrderItemDO::getOrderId, orderIds)
@@ -1318,7 +1314,7 @@ public class PlanServiceImpl implements PlanService {
planDOS.forEach(f->{
if(f.getType().equals(PlanStatusEnum.OPENED.getStatus())){
if(f.getStatus().equals(PlanStatusEnum.OPENED.getStatus())){
f.setStatus(PlanStatusEnum.OPENING.getStatus());
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java
+12 -41
View File
@@ -536,68 +536,38 @@ public class PlateServiceImpl implements PlateService {
List<OrderModelDO> orderPlateModelDOS = new ArrayList<>();
List<String> goodsIds = new ArrayList<>(reqVO.stream().map(OptimizationSavePlateReqVO::getGoodsId).distinct().toList());
Map<String,String> plateIdAndNo = new HashMap<>();
Long planId = Optional.ofNullable(reqVO.get(0).getPlanId()).orElseThrow(()-> exception(ORDER_PLAN_PLATE_ERROR));
PlanDO planDO = planMapper.selectById(planId);
AssertUtils.notEmpty(planDO,ORDER_PLAN_DATE_ERROR);
List<Long> orderIds = reqVO.stream().map(OptimizationSavePlateReqVO::getOrderId).distinct().toList();
List<GoodsDO> goodsDOList = goodsMapper.selectOrderGoodsList(orderIds, goodsIds, getUserOrganId());
List<PlanItemDO> planItemDOList = planItemMapper.selectPlanOrderGoodsList(planId, orderIds, getUserOrganId());
goodsIds.removeAll(goodsDOList.stream().map(GoodsDO::getGoodsId).distinct().toList());
List<Long> goodsId = planItemDOList.stream().map(PlanItemDO::getGoodsId).distinct().toList();
if(CollUtil.isNotEmpty(goodsIds)){
List<GoodsDO> goodsDOS = new ArrayList<>();
List<PlateGoodDO> plateGoodDOS = plateGoodMapper.selectGoodsByGoodsId(goodsIds, getUserOrganId());
for (PlateGoodDO plateGoodDO : plateGoodDOS) {
GoodsDO goodsDO = GoodsDO.builder()
.id(null)
.orderId(reqVO.stream().filter(f -> f.getGoodsId().equals(plateGoodDO.getGoodsId())).map(OptimizationSavePlateReqVO::getOrderId).toList().get(0))
.rawGoodsId("0")
.goodsId(plateGoodDO.getGoodsId())
.goodsName(plateGoodDO.getGoodsName())
.material(plateGoodDO.getMaterial())
.texture(plateGoodDO.getTexture())
.color(plateGoodDO.getColor())
.width(BigDecimal.valueOf(plateGoodDO.getWidth()))
.height(BigDecimal.valueOf(plateGoodDO.getHeight()))
.thickness(BigDecimal.valueOf(plateGoodDO.getThickness()))
.remark(plateGoodDO.getRemark())
.brand(plateGoodDO.getBrand())
.build();
goodsDOS.add(goodsDO);
}
goodsMapper.insertBatch(goodsDOS);
goodsDOList.addAll(goodsDOS);
}
List<GoodsDO> goodsDOS = goodsMapper.selectBatchIds(goodsId);
reqVO.forEach(f->{
List<String> plateNoList = new ArrayList<>();
Long orderId = f.getOrderId();
GoodsDO goodsDO = goodsDOList.stream().filter(g -> g.getGoodsId().equals(f.getGoodsId())).toList().get(0);
GoodsDO goodsDO = goodsDOS.stream().filter(g -> g.getOrderId().equals(f.getOrderId())).toList().get(0);
orderBodyNumVOS.add(OrderBodyNumVO.builder()
.bodyId(f.getBodyId())
.plateNum(f.getMultiple())
.build());
// 生成板编号
long obtainingTime = SnowflakeIdWorker3rd.obtainingTime();
String plateNo = (obtainingTime) + Long.toString(idWorker.nextId()).substring(2);
plateNoList.add(plateNo);
String remake1 = f.getRemake1() == null ? "" : f.getRemake1() + ";";
String remake2 = f.getRemake2() == null ? "" : f.getRemake2();
@@ -605,6 +575,7 @@ public class PlateServiceImpl implements PlateService {
// 小板ID
Long plateId = (Long) identifierGenerator.nextId(null);
plateIdAndNo.put(plateId.toString(),plateNo);
plateDOS.add(PlateDO.builder()
.id(plateId)
@@ -658,7 +629,7 @@ public class PlateServiceImpl implements PlateService {
insertPlateRespVOS.add(InsertPlateRespVO.builder()
.blockKey(f.getBlockKey())
.plateNo(plateNoList)
.plateNo(plateIdAndNo)
.build());
});