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

查询未排单小板SQL更改，排单排序参数修改

Browse Source
This commit is contained in:
liuzhaotian
2025-03-20 14:31:09 +08:00
parent 6b7e15776f
commit 0bc315d1f4
8 changed files with 37 additions and 22 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/PlanController.java
+1 -1
View File
@@ -111,7 +111,7 @@ public class PlanController {
@PutMapping("/setSort")
@Operation(summary = "设置排单优先级")
@PreAuthorize("@ss.hasPermission('placeorder:priority')")
public CommonResult<Boolean> setSort(@Valid @NotEmpty(message = "参数不能空") @Size(max = 2,message = "做多两条数据") @RequestBody List<SortVO> sortVos) {
public CommonResult<Boolean> setSort(@Valid @NotEmpty(message = "参数不能空") @Size(max = 2,message = "最多两条数据") @RequestBody List<SortVO> sortVos) {
planService.setSort(sortVos);
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/SortVO.java
+7 -2
View File
@@ -18,7 +18,8 @@ public class SortVO {
@NotNull(message = "排单id 不能空")
private Long planId;
@Schema(description = "排序")
@Schema(description = "排序", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "排序不能空")
private Long sort;
@@ -27,8 +28,12 @@ public class SortVO {
private Boolean isTopUp;
@Schema(description = "是否第一条数据",example = "false")
@Schema(description = "是否为第一条数据",example = "false")
private Boolean isOnePlan;
@Schema(description = "是否为最后一条数据",example = "false")
private Boolean isLastPln;
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java
+2 -2
View File
@@ -275,9 +275,9 @@ public interface OrderMapper extends BaseMapperX<OrderDO> {
IPage<OrderGoodsResp> selectFilterGoodsPlatePage(@Param("page") IPage page,@Param(Constants.WRAPPER) QueryWrapperX<OrderDO> queryWrapperX);
List<Long> selectNoPlanOrderPlateCount(@Param(Constants.WRAPPER) Wrapper<OrderDO> wrapper);
List<Long> selectNoPlanOrderPlateCount(@Param(Constants.WRAPPER) Wrapper<OrderDO> wrapper,@Param("organId") Long organId);
List<PlateResList> selectNoPlanOrderPlateList(@Param(Constants.WRAPPER) Wrapper<OrderDO> wrapper,@Param("pageNo") Integer pageNo,@Param("pageSize") Integer pageSize);
List<PlateResList> selectNoPlanOrderPlateList(@Param(Constants.WRAPPER) Wrapper<OrderDO> wrapper,@Param("pageNo") Integer pageNo,@Param("pageSize") Integer pageSize,@Param("organId") Long organId);
default PageResult<OrderDO> selectProductionPage(OrderPlatePageReqVO pageReqVO) {
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plan/PlanMapper.java
+1 -1
View File
@@ -148,7 +148,7 @@ public interface PlanMapper extends BaseMapperX<PlanDO> {
PlanDO selectSortOnePlan(@Param("sort") Long sort, @Param("organId") Long organId);
PlanDO selectLostPlan(@Param("sort") Long sort, @Param("organId") Long organId);
PlanDO selectLastPlan(@Param("sort") Long sort, @Param("organId") Long organId);
default List<PlanDO> selectIsTopPlanList(Long organId) {
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java
+14 -5
View File
@@ -821,6 +821,8 @@ public class PlanServiceImpl implements PlanService {
List<Long> planIds = sortVos.stream().map(SortVO::getPlanId).toList();
List<Long> sorts = new ArrayList<>();
for (Long planId : planIds) {
PlanDO planDO = planMapper.selectById(planId);
@@ -829,6 +831,7 @@ public class PlanServiceImpl implements PlanService {
throw exception(PLAN_NOT_DATA_EXISTS,planId);
}
sorts.add(planDO.getSort());
}
@@ -836,15 +839,20 @@ public class PlanServiceImpl implements PlanService {
SortVO sortVO = sortVos.get(0);
if(sortVO.getIsOnePlan() != null){
if(sortVO.getIsOnePlan() != null || sortVO.getIsLastPln() != null){
PlanDO planDO = planMapper.selectById(sortVO.getPlanId());
Long sort = planDO.getSort();
PlanDO plan = Boolean.TRUE.equals(sortVO.getIsOnePlan()) ?
planMapper.selectSortOnePlan(sort, getUserOrganId()) :
planMapper.selectLostPlan(sort, getUserOrganId());
PlanDO plan = new PlanDO();
if(Boolean.TRUE.equals(sortVO.getIsOnePlan())){
plan = planMapper.selectSortOnePlan(sort, getUserOrganId());
}else if(Boolean.TRUE.equals(sortVO.getIsLastPln())){
plan = planMapper.selectLastPlan(sort, getUserOrganId());
}
AssertUtils.notEmpty(plan,PLAN_SORT_DATA_ERROR);
@@ -875,9 +883,10 @@ public class PlanServiceImpl implements PlanService {
ArrayList<PlanDO> planDOS = new ArrayList<>();
sortVos.forEach(e -> {
planDOS.add(PlanDO.builder()
.id(e.getPlanId())
.sort(e.getSort())
.sort(sorts.stream().filter(f -> !f.equals(e.getSort())).findFirst().orElse(e.getSort()))
.build());
});
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java
+5 -4
View File
@@ -291,10 +291,11 @@ public class PlateServiceImpl implements PlateService {
statusList.add(OrderStatusEnum.IN_PRODUCTION.getStatus());
statusList.add(OrderStatusEnum.SORTED.getStatus());
Long organId = getUserOrganId();
QueryWrapperX<OrderDO> queryWrapperX = new QueryWrapperX<>();
queryWrapperX
.eq("o.organ_id",getUserOrganId())
.eq("o.organ_id",organId)
.eq("o.deleted",false)
.in("o.status",statusList)
.isNull("opi.plan_id")
@@ -305,7 +306,7 @@ public class PlateServiceImpl implements PlateService {
Long planId = pageReqVO.getPlanId();
List<OrderGoodsResp> goodsRespVOS = planMapper.selectPlanGoodsList(planId, getUserOrganId());
List<OrderGoodsResp> goodsRespVOS = planMapper.selectPlanGoodsList(planId, organId);
AssertUtils.notEmpty(goodsRespVOS,PLAN_NOT_EXISTS);
@@ -387,7 +388,7 @@ public class PlateServiceImpl implements PlateService {
Integer pageNo = (pageReqVO.getPageNo() - 1) * pageReqVO.getPageSize();
List<PlateResList> plateResLists = orderMapper.selectNoPlanOrderPlateList(queryWrapperX,pageNo,pageReqVO.getPageSize());
List<PlateResList> plateResLists = orderMapper.selectNoPlanOrderPlateList(queryWrapperX,pageNo,pageReqVO.getPageSize(),organId);
if(CollUtil.isEmpty(plateResLists)){
@@ -398,7 +399,7 @@ public class PlateServiceImpl implements PlateService {
queryWrapperX
.groupBy("o.id");
List<Long> plateCount = orderMapper.selectNoPlanOrderPlateCount(queryWrapperX);
List<Long> plateCount = orderMapper.selectNoPlanOrderPlateCount(queryWrapperX,organId);
long sum = plateCount.stream().mapToLong(Long::longValue).sum();
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml
+6 -6
View File
@@ -415,9 +415,9 @@
count(op.id)
from orders o
left join order_plate op on o.organ_id = op.organ_id and o.id = op.order_id
left join order_goods og on op.organ_id = og.organ_id and op.order_id = og.order_id and op.goods_id = og.id
left join order_plan_item opi on op.organ_id = opi.organ_id and op.order_id = opi.order_id and op.id = opi.plate_id
left join order_plate op on o.id = op.order_id and op.organ_id = #{organId}
left join order_goods og on op.order_id = og.order_id and op.goods_id = og.id and og.organ_id = #{organId}
left join order_plan_item opi on op.order_id = opi.order_id and op.id = opi.plate_id and opi.organ_id = #{organId}
${ew.customSqlSegment}
@@ -456,9 +456,9 @@
op.remark as remark
from orders o
left join order_plate op on o.organ_id = op.organ_id and o.id = op.order_id
left join order_goods og on op.organ_id = og.organ_id and op.order_id = og.order_id and op.goods_id = og.id
left join order_plan_item opi on op.organ_id = opi.organ_id and op.order_id = opi.order_id and op.id = opi.plate_id
left join order_plate op on o.id = op.order_id and op.organ_id = #{organId}
left join order_goods og on op.order_id = og.order_id and op.goods_id = og.id and og.organ_id = #{organId}
left join order_plan_item opi on op.order_id = opi.order_id and op.id = opi.plate_id and opi.organ_id = #{organId}
${ew.customSqlSegment}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plan/PlanMapper.xml
+1 -1
View File
@@ -191,7 +191,7 @@
</select>
<select id="selectLostPlan" resultType="com.cf.imes.module.executor.dal.dataobject.plan.PlanDO">
<select id="selectLastPlan" resultType="com.cf.imes.module.executor.dal.dataobject.plan.PlanDO">
SELECT *