blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
廖井涛
2025-08-07 ac0bc1d3df54c8f18a10b135daf28faebb25d20a 
 north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java


@@ -11,12 +11,12 @@


import com.example.erp.entity.userInfo.Log;


import com.example.erp.exception.ServiceException;


import com.example.erp.mapper.pp.FlowCardMapper;


import com.example.erp.mapper.pp.ReportingWorkMapper;


import com.example.erp.mapper.sd.*;


import com.example.erp.service.userInfo.LogService;


import com.fasterxml.jackson.databind.ObjectMapper;


import org.springframework.stereotype.Service;




import java.awt.*;


import java.time.LocalDate;


import java.util.List;


import java.util.Map;


@@ -48,8 +48,12 @@




    private final OrderDetailMapper orderDetailMapper;


    private final OrderMapper orderMapper;


    private final ReportingWorkMapper reportingWorkMapper;




    public FlowCardService(FlowCardMapper flowCardMapper, OrderGlassDetailMapper orderGlassDetailMapper, OrderProcessDetailMapper orderProcessDetailMapper, LogService logService, ProductMapper productMapper, ProductDetailMapper productDetailMapper, OrderDetailMapper orderDetailMapper, OrderMapper orderMapper) {


    public FlowCardService(FlowCardMapper flowCardMapper, OrderGlassDetailMapper orderGlassDetailMapper,


                           OrderProcessDetailMapper orderProcessDetailMapper, LogService logService,


                           ProductMapper productMapper, ProductDetailMapper productDetailMapper,


                           OrderDetailMapper orderDetailMapper, OrderMapper orderMapper,ReportingWorkMapper reportingWorkMapper) {


        this.flowCardMapper = flowCardMapper;


        this.orderGlassDetailMapper = orderGlassDetailMapper;


        this.orderProcessDetailMapper = orderProcessDetailMapper;


@@ -58,6 +62,7 @@


        this.productDetailMapper = productDetailMapper;


        this.orderDetailMapper = orderDetailMapper;


        this.orderMapper = orderMapper;


        this.reportingWorkMapper = reportingWorkMapper;


    }




    //流程卡管理查询


@@ -1449,6 +1454,16 @@


        }




    }




    public Map<String, Object> selectCompletedSv(String processId, Integer orderNumber, String process) {


        Map<String, Object> map = new HashMap<>();


        String[] processList = process.split("->");


        //获取工艺流程第一个工序


        String interceptProcess = processList[0];


        map.put("data", flowCardMapper.selectCompletedMp(processId, orderNumber,interceptProcess));




        return map;


    }


}