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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
liuzhaotian
2024-05-20 17:32:16 +08:00
parent f2d7b6dc30 7955e9071d
commit 01d8ebe45e
10 changed files with 70 additions and 57 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/api/orderProcess/OrderProcessServiceImpl.java → cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/api/orderProcess/OrderProcessApiImpl.java
+6 -1
View File
@@ -4,18 +4,23 @@ package com.cf.imes.module.executor.api.orderProcess;
import com.cf.imes.framework.common.pojo.CommonResult;
import com.cf.imes.module.executor.dal.dataobject.process.OrderProcessDO;
import com.cf.imes.module.executor.service.process.OrderProcessService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import static com.cf.imes.framework.common.pojo.CommonResult.success;
public class OrderProcessServiceImpl implements OrderProcessApi{
@RestController // 提供 RESTful API 接口，给 Feign 调用
@Validated
public class OrderProcessApiImpl implements OrderProcessApi{
@Resource
private OrderProcessService orderProcessService;
@Override
public CommonResult<Boolean> getOrderProcessByProcessGroupId(Long id) {
System.out.println(" Long id " + id);
OrderProcessDO plateDO = orderProcessService.getOrderProcessByProcessGroupId(id);
if (plateDO == null) {
return success(false);
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/process/OrderProcessDO.java
+1 -1
View File
@@ -13,7 +13,7 @@ import com.cf.imes.framework.mybatis.core.dataobject.BaseDO;
*
* @author 晨丰科技
*/
@TableName("order_process")
@TableName("imes_prod.order_process")
@KeySequence("order_process_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@Data
@EqualsAndHashCode(callSuper = true)
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/process/OrderProcessServiceImpl.java
+22 -22
View File
@@ -70,30 +70,30 @@ public class OrderProcessServiceImpl implements OrderProcessService {
// 插入
OrderProcessDO orderProcess = BeanUtils.toBean(createReqVO, OrderProcessDO.class).setId((Long) identifierGenerator.nextId(null));
//
// List<ProcessStepDO> processStepDOS = new ArrayList<>();
// List<OrderProcessStepItemDO> orderProcessStepItemDOS = new ArrayList<>();
// // 需要获取工序组的具体信息，以及工序组中工序的信息，然后将工序组中工序的信息插入到生产单工序步骤表中
// ProcessListReqDTO processListReqDTO = processGroupApi.getProcessGroupDetail(createReqVO.getGroupId());
// System.err.println(processListReqDTO);
// processListReqDTO.getLists().forEach(processRespDTO -> {
// ProcessStepDO processStepDO = BeanUtils.toBean(processRespDTO, ProcessStepDO.class).setOrderId(createReqVO.getOrderId())
// .setStatus(false).setProcessinfoId(processRespDTO.getId()).setOrderProcessId(orderProcess.getId())
// .setId((Long) identifierGenerator.nextId(null));// 计划日期没有填写
// processStepDOS.add(processStepDO);
// OrderProcessStepItemDO orderProcessStepItemDO = OrderProcessStepItemDO.builder()
// .name(processRespDTO.getName())
// .processStepId(processRespDTO.getId())
// .orderProcessId(orderProcess.getId())
// .status(false)
// .groupName(processListReqDTO.getName())
// .build();// 查模块id，柜体id，加工组id
// orderProcessStepItemDOS.add(orderProcessStepItemDO);
// });
List<ProcessStepDO> processStepDOS = new ArrayList<>();
List<OrderProcessStepItemDO> orderProcessStepItemDOS = new ArrayList<>();
// 需要获取工序组的具体信息，以及工序组中工序的信息，然后将工序组中工序的信息插入到生产单工序步骤表中
ProcessListReqDTO processListReqDTO = processGroupApi.getProcessGroupDetail(createReqVO.getGroupId());
processListReqDTO.getLists().forEach(processRespDTO -> {
ProcessStepDO processStepDO = BeanUtils.toBean(processRespDTO, ProcessStepDO.class).setOrderId(createReqVO.getOrderId())
.setStatus(false).setProcessinfoId(processRespDTO.getId()).setOrderProcessId(orderProcess.getId())
.setId((Long) identifierGenerator.nextId(null));// 计划日期没有填写
processStepDOS.add(processStepDO);
OrderProcessStepItemDO orderProcessStepItemDO = OrderProcessStepItemDO.builder()
.name(processRespDTO.getName())
.processStepId(processRespDTO.getId())
.orderProcessId(orderProcess.getId())
.status(false)
.groupName(processListReqDTO.getName())
.build();// 查模块id，柜体id，加工组id
orderProcessStepItemDOS.add(orderProcessStepItemDO);
});
// 批量插入
orderProcessMapper.insert(orderProcess);
// processStepMapper.insertBatch(processStepDOS);
// processStepItemMapper.insertBatch(orderProcessStepItemDOS);
processStepMapper.insertBatch(processStepDOS);
processStepItemMapper.insertBatch(orderProcessStepItemDOS);
// 返回
return orderProcess.getId();
}