Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

chenlu

2025-11-26 97413a9725e1441f070edc139c1002954f1f50b7

Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

 north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProcessCard.vue

@@ -309,10 +309,10 @@
      ElMessage.error(t('order.msg.pleaseCancelTheFilteringFirst'))
      return
    }
    if (selectRecords.length == 0) {
      ElMessage.warning(t('reportingWorks.selectProcessCardData'))
      return;
    }
    // if (selectRecords.length == 0) {
    //   ElMessage.warning(t('reportingWorks.selectProcessCardData'))
    //   return;
    // }

    let projectData = ref({
      projectdetail: selectRecords,

 north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/ProjectDetail.vue

@@ -596,6 +596,21 @@
    optimizeData.value.glassDetails = [];
    // 从表格中获取 glassDetail 数据，而不是从后端接口读取
    const tableData = xGrid.value.getTableData().fullData;
    let totalQuantity = 0;
    let totalArea = 0;

    tableData.forEach(item => {
      const width = parseFloat(item.width) || 0;
      const height = parseFloat(item.height) || 0;
      const quantity = parseInt(item.quantity) || 0;

      // 使用长×宽×数量来计算总面积
      totalArea += (width * height * quantity) / 1000000; // 转换为平方米
      totalQuantity += quantity;
    });

    quantitys.value = totalQuantity;
    areas.value = totalArea;
    const glassDetailData = tableData.map(item => {
      let rackNoValue = 0;
      if (item.rackNo !== undefined && item.rackNo !== null && item.rackNo !== '') {
@@ -854,7 +869,7 @@

      xGrid.value.loadData(data);
      gridOptions.data = data;
      projectName.value = data[0].project_name;
      projectName.value = res.data.project.project_name;
      quantitys.value=res.data.project.glass_total
      areas.value=res.data.project.glass_total_area


 north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue

@@ -13,6 +13,7 @@
import DxfParser from 'dxf-parser';
import { Leafer, Polygon,Ellipse,Line,Path } from 'leafer-ui'
import {round} from "xe-utils";
import {add} from '@/utils/decimal'
const { t } = useI18n()

const router = useRouter()
@@ -174,8 +175,7 @@
                const value1 = value*1
                $grid.getTableData().visibleData.forEach((item,index) =>{
                  if(index>=result.start && index<=result.end){

                    item[result.cell] = item[result.cell]*1+value1
                    item[result.cell] =add(item[result.cell]*1,value1)
                  }

                })

 north-glass-erp/src/main/java/com/example/erp/mapper/pp/GlassOptimizeMapper.java

@@ -241,4 +241,6 @@
    void updateProjectTemperingId(String projectNumber);

    List<Map<String, Object>> optimizeTemp(String projectNo);

    List<Map<String, Object>> selectTempProject(String processId);
}

 north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java

@@ -927,68 +927,63 @@
            int state2 = 0;
            StringBuilder processId= new StringBuilder();
            List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("projectdetail")), FlowCard.class);
            if (!flowCardList.isEmpty()) {
                if(projectType.equals("2")){
                    deleteProject(projectId,2);
            if(projectType.equals("2")){
                deleteProject(projectId,2);
            }

            // 创建一个映射来存储 (processId-technologyNumber) 组合到 rack 编号的映射
            Map<String, Integer> rackMap = new HashMap<>();
            int rackCounter = 1;

            for (FlowCard flowCard : flowCardList) {
                // 为每个唯一的 processId-technologyNumber 组合分配 rack 编号
                String key = flowCard.getProcessId() + "-" + flowCard.getTechnologyNumber();
                if (!rackMap.containsKey(key)) {
                    rackMap.put(key, rackCounter++);
                }
                int rackValue = rackMap.get(key);

                if(flowCard.getPatchState().equals(0)){
                    state1=1;
                    //给流程卡表添加对应的工程号
                    Boolean a = glassOptimizeMapper.updateFlowCardProject(flowCard.getProcessId(),flowCard.getTechnologyNumber(),projectId);
                    // 更新流程卡的rack字段
                    glassOptimizeMapper.updateFlowCardRack(flowCard.getProcessId(), flowCard.getTechnologyNumber(), rackValue);
                    area = glassOptimizeMapper.getSelectArea(flowCard.getProcessId(),flowCard.getTechnologyNumber()).doubleValue();
                    sumArea = sumArea.add(BigDecimal.valueOf(area));
                    sumQuantity +=flowCard.getQuantity();
                    processId.append(flowCard.getProcessId()).append("-").append(flowCard.getTechnologyNumber()).append(";");
                }else{
                    state2=1;
                    Boolean a=glassOptimizeMapper.updatePatchLogProject(flowCard.getProcessId(),flowCard.getTechnologyNumber(),projectId);
                    area = glassOptimizeMapper.getSelectAreaPatchLog(flowCard.getProcessId(),flowCard.getTechnologyNumber()).doubleValue();
                    sumArea = sumArea.add(BigDecimal.valueOf(area));
                    sumQuantity +=flowCard.getQuantity();
                    processId.append(flowCard.getProcessId()).append("-").append(flowCard.getTechnologyNumber()).append(";");
                }

                // 创建一个映射来存储 (processId-technologyNumber) 组合到 rack 编号的映射
                Map<String, Integer> rackMap = new HashMap<>();
                int rackCounter = 1;

                for (FlowCard flowCard : flowCardList) {
                    // 为每个唯一的 processId-technologyNumber 组合分配 rack 编号
                    String key = flowCard.getProcessId() + "-" + flowCard.getTechnologyNumber();
                    if (!rackMap.containsKey(key)) {
                        rackMap.put(key, rackCounter++);
                    }
                    int rackValue = rackMap.get(key);

                    if(flowCard.getPatchState().equals(0)){
                        state1=1;
                        //给流程卡表添加对应的工程号
                        Boolean a = glassOptimizeMapper.updateFlowCardProject(flowCard.getProcessId(),flowCard.getTechnologyNumber(),projectId);
                        // 更新流程卡的rack字段
                        glassOptimizeMapper.updateFlowCardRack(flowCard.getProcessId(), flowCard.getTechnologyNumber(), rackValue);
                        area = glassOptimizeMapper.getSelectArea(flowCard.getProcessId(),flowCard.getTechnologyNumber()).doubleValue();
                        sumArea = sumArea.add(BigDecimal.valueOf(area));
                        sumQuantity +=flowCard.getQuantity();
                        processId.append(flowCard.getProcessId()).append("-").append(flowCard.getTechnologyNumber()).append(";");
                    }else{
                        state2=1;
                        Boolean a=glassOptimizeMapper.updatePatchLogProject(flowCard.getProcessId(),flowCard.getTechnologyNumber(),projectId);
                        area = glassOptimizeMapper.getSelectAreaPatchLog(flowCard.getProcessId(),flowCard.getTechnologyNumber()).doubleValue();
                        sumArea = sumArea.add(BigDecimal.valueOf(area));
                        sumQuantity +=flowCard.getQuantity();
                        processId.append(flowCard.getProcessId()).append("-").append(flowCard.getTechnologyNumber()).append(";");
                    }

                }
                if(state1==1&&state2==0){
                    type=1;
                }else if(state1==1&&state2==1){
                    type=2;
                }
                int index = optionVal.indexOf("mm");
                // 获取 "mm" 前面的部分
                String glass_thickness = optionVal.substring(0, index);
                // 获取 "mm" 后面的部分
                String glass_type = optionVal.substring(index + 2);
                if(projectType.equals("2")){
                    glassOptimizeMapper.updateProjectMp(projectId,projectNmae,glass_thickness,glass_type,sumQuantity,sumArea.doubleValue(),userName,
            }
            if(state1==1&&state2==0){
                type=1;
            }else if(state1==1&&state2==1){
                type=2;
            }
            int index = optionVal.indexOf("mm");
            // 获取 "mm" 前面的部分
            String glass_thickness = optionVal.substring(0, index);
            // 获取 "mm" 后面的部分
            String glass_type = optionVal.substring(index + 2);
            if(projectType.equals("2")){
                glassOptimizeMapper.updateProjectMp(projectId,projectNmae,glass_thickness,glass_type,sumQuantity,sumArea.doubleValue(),userName,
                        flowCardList.size(), String.valueOf(processId),type);
            }else{
                if(glassOptimizeMapper.selectProjectCount(projectId)==null){
                    glassOptimizeMapper.addProjectMp(projectId,projectNmae,glass_thickness,glass_type,sumQuantity,sumArea.doubleValue(),userName,
                            flowCardList.size(), String.valueOf(processId),type);
                }else{
                    if(glassOptimizeMapper.selectProjectCount(projectId)==null){
                        glassOptimizeMapper.addProjectMp(projectId,projectNmae,glass_thickness,glass_type,sumQuantity,sumArea.doubleValue(),userName,
                                flowCardList.size(), String.valueOf(processId),type);
                    }else{
                        TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
                        return "false1";
                    }
                    TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
                    return "false1";
                }
            }else {
                return "false2";

            }
        } catch (Exception e) {
            TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
@@ -1394,6 +1389,8 @@
    public Map<String, Object> getProductListSv(String processId) {
        Map<String, Object> productMap = new HashMap<>();
        List<Map<String, Object>> productInfo = glassOptimizeMapper.selectProjectList(processId);
        List<Map<String, Object>> tempProductInfo = glassOptimizeMapper.selectTempProject(processId);
        productInfo.addAll(tempProductInfo);
        productMap.put("productInfo", productInfo);
        Map<String, Object> map = new HashMap<>();

@@ -1401,7 +1398,7 @@
            // 按照 processCard 分组
            Map<String, List<Map<String, Object>>> groupedByProcessCard = new HashMap<>();
            for (Map<String, Object> item : productInfo) {
                String processCard = (String) item.get("processCard");
                String processCard = String.valueOf(item.get("processCard"));
                if (processCard != null) {
                    groupedByProcessCard.computeIfAbsent(processCard, k -> new ArrayList<>()).add(item);
                }

 north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java

@@ -972,14 +972,14 @@
        }
        String inputVal= (String) dates.get("inputVal");
        String project= (String) dates.get("project");
        String terminationVals= (String) dates.get("terminationVals");
        if ("null".equals(inputVal)) {
        String terminationVals= dates.get("terminationVals").toString();;
        if (inputVal==null) {
            inputVal = "";
        }
        if ("null".equals(project)) {
        if (project==null) {
            project = "";
        }
        if ("null".equals(terminationVals)) {
        if (terminationVals==null) {
            terminationVals = "";
        }
        List<WorkInProgressDTO> dataList1  =reportMapper.exportWorkInProgressMp(process,inputVal,project,terminationVals);
@@ -1243,14 +1243,14 @@
        }
        String inputVal= (String) dates.get("inputVal");
        String project= (String) dates.get("project");
        String terminationVals= (String) dates.get("terminationVals");
        if ("null".equals(inputVal)) {
        String terminationVals= dates.get("terminationVals").toString();;
        if (inputVal==null) {
            inputVal = "";
        }
        if ("null".equals(project)) {
        if (project==null) {
            project = "";
        }
        if ("null".equals(terminationVals)) {
        if (terminationVals==null) {
            terminationVals = "";
        }


 north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml

@@ -2173,6 +2173,30 @@
        o_width,
        o_height
    </select>
    <select id="selectTempProject" resultType="java.util.Map" parameterType="java.lang.String">
        SELECT
            project_no,
            o_width as width,
            o_height as height,
            rack_no as order_number,
            layer as processCard,
            COUNT(*) as quantity,
            ROUND(o_width * o_height * COUNT(*) / 1000000, 4) as Area
        FROM
            pp.`optimize_detail`
        WHERE
            project_no =  #{processId}
          AND process_id = ''
        GROUP BY
            project_no,
            layer,
            o_width,
            o_height,
            rack_no
        ORDER BY
            o_width,
            o_height
    </select>


</mapper>

 north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml

@@ -79,7 +79,7 @@
                            when 'stepD' then 4
                            when 'stepB' then 4
                            else 1
                     end as sort,
                     end as sortByprocess,
                    b.sort as 'sort2'


@@ -101,7 +101,7 @@
                                                    group by opd.id) as a
                    GROUP BY process)   as sort1
        on sort1.process = a.process
        order by sort,sort2,sort1.count,id
        order by sortByprocess,sort1.count,sort2,id

    </select>