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:
gaoqr
2026-06-03 14:18:34 +08:00
parent ece90b7d35
commit d2168fd743
3 changed files with 10 additions and 2 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/dal/mysql/plate/PlateMapper.java
+1 -1
View File
@@ -436,7 +436,7 @@ public interface PlateMapper extends BaseMapperX<PlateDO> {
* @param planId * @param planId
* @return * @return
*/ */
List<Long> selectPlanAllCuttedOrderIdList(@Param("planId") Long planId); List<Long> selectPlanAllCuttedOrderIdList(@Param("planId") Long planId, @Param("orderIds") List<Long> orderIds);
/** /**
* 查询排单板件信息 * 查询排单板件信息
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java
+1 -1
View File
@@ -1886,7 +1886,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
int updatedCount = plateMapper.updatePlanPlateCutStatus(planId, orderIds, optimizatePlateNoList); int updatedCount = plateMapper.updatePlanPlateCutStatus(planId, orderIds, optimizatePlateNoList);
// 查询已全部开料的订单号 // 查询已全部开料的订单号
List<Long> allCuttedOrderIdList = plateMapper.selectPlanAllCuttedOrderIdList(planId); List<Long> allCuttedOrderIdList = plateMapper.selectPlanAllCuttedOrderIdList(planId, orderIds);
// 更新已全部开料和全部打包的订单为生产完成 // 更新已全部开料和全部打包的订单为生产完成
if (CollUtil.isNotEmpty(allCuttedOrderIdList)) { if (CollUtil.isNotEmpty(allCuttedOrderIdList)) {
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
+8
View File
@@ -1564,9 +1564,17 @@
FROM order_plate op FROM order_plate op
WHERE op.order_id = o.id WHERE op.order_id = o.id
AND op.plan_id = #{planId} AND op.plan_id = #{planId}
AND op.order_id in
<foreach collection="orderIds" item="orderId" open="(" close=")" separator=",">
#{orderId}
</foreach>
AND op.deleted = false AND op.deleted = false
AND op.is_cutted in (0, 1)) AND op.is_cutted in (0, 1))
AND o.deleted = false AND o.deleted = false
AND o.id in
<foreach collection="orderIds" item="orderId" open="(" close=")" separator=",">
#{orderId}
</foreach>
</select> </select>
<select id="selectPlanPlateInfoPage" <select id="selectPlanPlateInfoPage"