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:
liuzhaotian
2024-11-25 14:56:52 +08:00
parent 185d6ce34b
commit 5931c21034
13 changed files with 154 additions and 53 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/bo/OrderIds.java
-1
View File
@@ -7,7 +7,6 @@ import lombok.Data;
@Data
public class OrderIds {
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java
+17 -9
View File
@@ -266,8 +266,11 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
List<OrderDO> orderDOS = orderMapper.selectOrderPackList(orderIds, getUserOrganId());
if (ObjectUtil.isNotEmpty(orderDOS)) {
List<OrderDO> orderDOList = orderDOS.stream().map(m -> m.setStatus(OrderStatusEnum.FINISH_PRODUCTION.getStatus())).toList();
orderMapper.updateBatch(orderDOList);
orderDOS.forEach(f -> {
f.setStatus(OrderStatusEnum.FINISH_PRODUCTION.getStatus());
f.setFinishTime(LocalDateTime.now());
});
orderMapper.updateBatch(orderDOS);
}
}
@@ -304,9 +307,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
Boolean isOptimized = optimizeBoardModelDO.getIsOptimized();
if(Boolean.FALSE.equals(isOptimized)){
throw exception(ORDER_PLAN_NO_OPTIMIZE_UPDATE_ERROR);
}
@@ -355,9 +356,12 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
if(!orderIdList.isEmpty()) {
List<OrderDO> orderDOList = orderMapper.selectBatchIds(orderIdList);
orderMapper.updateBatch(orderDOList.stream()
.map(m -> m.setStatus(OrderStatusEnum.SORTED.getStatus()))
.toList());
orderDOList.forEach(f -> {
f.setStatus(OrderStatusEnum.SORTED.getStatus());
f.setFinishTime(null);
});
orderMapper.updateBatch(orderDOList);
}
return;
@@ -382,8 +386,11 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
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);
orderDOS.forEach(f -> {
f.setStatus(OrderStatusEnum.IN_PRODUCTION.getStatus());
f.setFinishTime(null);
});
orderMapper.updateBatch(orderDOS);
}
}
@@ -916,6 +923,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
// ES 文档数据刷新
public void refresh( String index) {
try {