hdy
2025-01-03 53cced5d293ea7ea48055deb18c5962442f86585
工单bom下发接口
已修改2个文件
58 ■■■■ 文件已修改
billion-main/src/main/java/com/billion/main/api/RestfulAPI.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
billion-main/src/main/java/com/billion/main/api/service/impl/WorkOrdersInfoServiceImpl.java 57 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
billion-main/src/main/java/com/billion/main/api/RestfulAPI.java
@@ -32,7 +32,6 @@
        try {
            // 调用service层保存数据
            boolean saveResult = iWorkOrdersInfoService.saveWorkOrders(workOrdersInfo);
            // 构建响应数据
            ApiResponse response = new ApiResponse();
            List<ApiResponse.ResponseData> dataList = new ArrayList<>();
billion-main/src/main/java/com/billion/main/api/service/impl/WorkOrdersInfoServiceImpl.java
@@ -1,7 +1,9 @@
package com.billion.main.api.service.impl;
import com.billion.main.api.domain.WorkOrdersInfo;
import com.billion.main.api.domain.WorkOrdersInfoChild;
import com.billion.main.api.service.IWorkOrdersInfoService;
import com.billion.main.bs.domain.BsBomChildInfo;
import com.billion.main.bs.domain.BsBomInfo;
import com.billion.main.bs.service.IBsBomChildInfoService;
import com.billion.main.bs.service.IBsBomInfoService;
@@ -11,8 +13,9 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
/**
 * 物料采集Service业务层处理
@@ -35,14 +38,7 @@
    @Override
    public boolean saveWorkOrders(WorkOrdersInfo workOrdersInfo) {
        try {
            BsBomInfo bsBomInfo = new BsBomInfo();
            bsBomInfo.setBomCode(workOrdersInfo.getBomName());
            bsBomInfo.setBomName(workOrdersInfo.getBomName());
            bsBomInfo.setProductCode(workOrdersInfo.getMaterialNumber());
            bsBomInfo.setProductName(workOrdersInfo.getMaterialNumber());
            bsBomInfoService.save(bsBomInfo);
            //保存工单信息
            OmProductionOrderInfo omProductionOrderInfo = new OmProductionOrderInfo();
            omProductionOrderInfo.setWorkOrderNo(workOrdersInfo.getOrderNumber());
            omProductionOrderInfo.setSalesOrderCode(workOrdersInfo.getBatchNumber());
@@ -50,26 +46,35 @@
            omProductionOrderInfo.setEngineType(workOrdersInfo.getEngineType());
            omProductionOrderInfo.setEngineName(workOrdersInfo.getEngineName());
            omProductionOrderInfo.setPlanQty(Long.valueOf(workOrdersInfo.getProductionPlan()));
            omProductionOrderInfo.setPlanStartTime(workOrdersInfo.getStartTime()));
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            Date startTime = sdf.parse(workOrdersInfo.getStartTime());
            omProductionOrderInfo.setPlanStartTime(startTime);
            omProductionOrderInfo.setRemarks(workOrdersInfo.getDescription());
            omProductionOrderInfo.setOrderStatus(workOrdersInfo.getState());
            omProductionOrderInfo.setFlag(workOrdersInfo.getFLAG());
            omProductionOrderInfoService.save(omProductionOrderInfo);
//            List<WorkOrdersInfoChild> childList = workOrdersInfo.getData();
//            for (WorkOrdersInfoChild child : childList) {
//                BsBomChildInfo bsBomChildInfo = new BsBomChildInfo();
//                bsBomChildInfo.setProductCode(workOrdersInfo.getMaterialNumber());
//                bsBomChildInfo.setProductName(workOrdersInfo.getMaterialNumber());
//                bsBomChildInfo.setBomCode(workOrdersInfo.getBomName());
//                bsBomChildInfo.setLocationCode(child.getStationName());
//                bsBomChildInfo.setLocationName(child.getStationName());
//                bsBomChildInfo.setMaterialCode(child.getMaterial());
//                bsBomChildInfo.setCostQty(child.getCount());
//                bsBomChildInfo.setChecked(child.getChecked());
//                bsBomChildInfo.setMaterialName(child.getMaterialName());
//                bsBomChildInfoService.save(bsBomChildInfo);
//            }
            //保存BOM主表信息
            BsBomInfo bsBomInfo = new BsBomInfo();
            bsBomInfo.setBomCode(workOrdersInfo.getBomName());
            bsBomInfo.setBomName(workOrdersInfo.getBomName());
            bsBomInfo.setProductCode(workOrdersInfo.getMaterialNumber());
            bsBomInfo.setProductName(workOrdersInfo.getMaterialNumber());
            bsBomInfoService.save(bsBomInfo);
            //保存BOM子表信息
            List<WorkOrdersInfoChild> childList = workOrdersInfo.getData();
            for (WorkOrdersInfoChild child : childList) {
                BsBomChildInfo bsBomChildInfo = new BsBomChildInfo();
                bsBomChildInfo.setProductCode(workOrdersInfo.getMaterialNumber());
                bsBomChildInfo.setProductName(workOrdersInfo.getMaterialNumber());
                bsBomChildInfo.setBomCode(workOrdersInfo.getBomName());
                bsBomChildInfo.setLocationCode(child.getStationName());
                bsBomChildInfo.setLocationName(child.getStationName());
                bsBomChildInfo.setMaterialCode(child.getMaterial());
                bsBomChildInfo.setCostQty(child.getCount());
                bsBomChildInfo.setChecked(child.getChecked());
                bsBomChildInfo.setMaterialName(child.getMaterialName());
                bsBomChildInfoService.save(bsBomChildInfo);
            }
            return true;
        } catch (Exception e) {
            throw new RuntimeException("保存工单信息失败", e);