Merge branch 'master' of http://bore.pub:10439/r/ERP_override

chenlu

2025-05-12 603c30271110d43b9c3d0f1aea82c20561d54111

Merge branch 'master' of http://bore.pub:10439/r/ERP_override

 north-glass-erp/northglass-erp/src/router/index.js

@@ -1231,15 +1231,15 @@
            }
          ]
        },
        {
        /*{
          //第三方玻璃优化
          path: 'glassOptimizeThirdParty',
          name: 'glassOptimizeThirdParty',
          component: () => import('../views/pp/glassOptimizeThirdParty/Optimize.vue'),
          children:[
            {
              path: 'optimizeProject',
              name: 'optimizeProject',
              path: 'optimizeProject1',
              name: 'optimizeProject1',
              component: () => import('../views/pp/glassOptimizeThirdParty/OptimizeProject.vue'),
            },
            {
@@ -1274,10 +1274,10 @@
            },
            {
              path: '',
              redirect:'/main/glassOptimizeThirdParty/optimizeProject'
              redirect:'/main/glassOptimizeThirdParty/optimizeProject1'
            }
          ]
        },
        },*/
        {
          path: '',
          redirect:'/main/order'

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

@@ -122,12 +122,16 @@
      const projectNumber = row.projectNumber;
      const thickness = row.thickness;
      const glassType = row.glassType;
      const quantity = row.quantity;
      const area = row.area;
      await router.push({
        name: 'optimizeInfo',
        params: {
          projectNo: projectNumber,
          thickNess: thickness,
          model: glassType
          model: glassType,
          quantity: quantity,
          area: area
        }
      });
    }

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

@@ -1,7 +1,13 @@
<script setup>
import {ref, computed} from "vue";
import {Connection} from "@element-plus/icons-vue";
import {useRoute} from "vue-router";


const props = defineProps({
  quantity : null,
  area:null
});
//计时器
let seconds = ref(0);
let isRunning = ref(false);
@@ -21,6 +27,7 @@
  return `${minutes.toString().padStart(2, '0')}:${remainingSeconds.toString().padStart(2, '0')}`;
});
const startTimer = () => {
  console.log(props)
  if (!isRunning.value) {
    intervalId = setInterval(() => {
      seconds.value++;
@@ -56,7 +63,7 @@
        <div>
          <span>总面积(m2)：</span>
          <vxe-input class="input" disabled placeholder=""></vxe-input>
          <span>总数量(片)：</span>
          <span>总数量(片)：{{props.quantity}}</span>
          <vxe-input class="input" disabled placeholder=""></vxe-input>
          <span>优化时长(秒)：</span>
          <span class="time-display">{{ formattedTime }}</span>

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

@@ -383,6 +383,8 @@
const projectName = ref('');
const thickNess = ref(route.params.thickNess);
const model = ref(route.params.model);
const quantitys = ref(route.params.quantity);
const areas = ref(route.params.area);
onBeforeUnmount(() => {
  localStorage.setItem('projectNo', projectNo.value);
});
@@ -566,7 +568,7 @@
        <el-button id="button" type="primary" @click="openDialog(4)">优化</el-button>
        <el-dialog v-model="dialogVisible[4]" title="优化计算" destroy-on-close
                   style="width: 75%;height:90%;margin-top: 3vh;">
          <optimize-compute/>
          <optimize-compute :quantity="quantitys" :area="areas" @send-data-event="handleTrimmingData"/>
        </el-dialog>
      </div>
    </div>

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

@@ -129,6 +129,8 @@

    Boolean updateOptimizeConfig(String json,Integer type);

    List<Map<String, Object>> getFlowCardListSimulated(String optionVal);





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

@@ -18,8 +18,14 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;

import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.math.BigDecimal;
import java.net.HttpURLConnection;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.sql.Date;
import java.text.DecimalFormat;
import java.util.*;
@@ -38,7 +44,7 @@
    RabbitMQUtil rabbitMQUtil;
    //模拟计算

    public Map<String, Object> SimulationCalculation(Map<String,Object> message) {
    /*public Map<String, Object> SimulationCalculation(Map<String,Object> message) {
        Map<String, Object> map = new HashMap<>();
        try {
            rabbitMQUtil = new RabbitMQUtil();
@@ -46,10 +52,10 @@


            // 获取 computeData 和 cardData
            /*Object computeData = message.get("computeData");
            Object cardData = message.get("cardData");*/
            *//*Object computeData = message.get("computeData");
            Object cardData = message.get("cardData");*//*

           rabbitMQUtil.sendMessage(message.toString());
            rabbitMQUtil.sendMessage(message.toString());
            System.out.println("send message: " + message);
            String date = rabbitMQUtil.receiveMessages();
            System.out.println("Received message: " + date);
@@ -61,6 +67,50 @@
        } catch (IOException e) {
            e.printStackTrace();
        } catch (TimeoutException | InterruptedException e) {
            e.printStackTrace();
        }

        return map;
    }*/

    public Map<String, Object> SimulationCalculation(Map<String,Object> message) {
        Map<String, Object> map = new HashMap<>();
        try {
            URL url = new URL("https://example.com"); // 替换为你的目标 URL
            HttpURLConnection conn = (HttpURLConnection) url.openConnection();

            conn.setRequestMethod("POST");
            conn.setDoOutput(true); // 允许写入请求体
            conn.setConnectTimeout(5000);
            // 读取超时（等待服务器响应的最大时间）
            conn.setReadTimeout(108000);

            // 写入请求体数据
            String postData = message.toString();
            try (OutputStream os = conn.getOutputStream()) {
                byte[] input = postData.getBytes(StandardCharsets.UTF_8);
                os.write(input, 0, input.length);
            }

            // 3. 获取状态码
            int statusCode = conn.getResponseCode();
            System.out.println("状态码: " + statusCode);

            // 4. 读取响应内容
            BufferedReader reader = new BufferedReader(
                    new InputStreamReader(conn.getInputStream())
            );
            String line;
            StringBuilder response = new StringBuilder();
            while ((line = reader.readLine()) != null) {
                response.append(line);
            }
            reader.close();

            // 输出响应内容
            System.out.println("响应内容:\n" + response.toString());

        }catch (Exception e) {
            e.printStackTrace();
        }

@@ -466,59 +516,6 @@



    public String simulatedTypesetting(Map<String, Object> object) {

        String optionVal = "";
        Integer quantity = 0;
        Double area = 0.0;
        if (object.get("optionVal") != null) {
            optionVal = object.get("optionVal").toString();
        }
        if (object.get("quantity") != null) {
            quantity = Integer.valueOf(object.get("quantity").toString());
        }
        if (object.get("area") != null) {
            area = Double.valueOf(object.get("area").toString());
        }
        List<Map<String, Object>> flowCardListNormal = glassOptimizeMapper.getFlowCardListNormal(optionVal);


        int currentQuantity = 0;
        double currentArea = 0;
        List<List<Map<String, Object>>> result = new ArrayList<>();
        List<Map<String, Object>> currentGroup = new ArrayList<>();

        if(area==0 && quantity>0){
            for(Map<String, Object> flowCardNormal: flowCardListNormal){
                if (Integer.valueOf(flowCardNormal.get("quantity").toString()) > quantity ) {
                    continue;
                }
                int newQuantity = currentQuantity + Integer.valueOf(flowCardNormal.get("quantity").toString());
                double newArea = currentArea + Double.valueOf(flowCardNormal.get("area").toString());
                if(newQuantity>quantity){
                    result.add(currentGroup);
                    currentGroup = new ArrayList<>();
                    currentQuantity = 0;
                    currentArea = 0;
                    newQuantity = Integer.valueOf(flowCardNormal.get("quantity").toString());
                    newArea = Double.valueOf(flowCardNormal.get("area").toString());

                }
                currentGroup.add(flowCardNormal);
                currentQuantity = newQuantity;
                currentArea = newArea;

            }

            if (!currentGroup.isEmpty()) {
                result.add(currentGroup);
            }
        }
            System.out.println(result);

        return "";

    }

    public String simulatedTypesetting1(Map<String, Object> object) {

@@ -538,7 +535,11 @@
        } else {
            area = 0.0;
        }
        List<Map<String, Object>> flowCardListNormal = glassOptimizeMapper.getFlowCardListNormal(optionVal);

        JSONArray materialStore = JSONArray.parseArray(JSONObject.toJSONString(object.get("materialStore")));


        List<Map<String, Object>> flowCardListNormal = glassOptimizeMapper.getFlowCardListSimulated(optionVal);


        Queue<Map<String, Object>> queue = flowCardListNormal.stream()

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

@@ -1054,6 +1054,23 @@
              c.order_number
    </select>

    <select id="getFlowCardListSimulated">
        SELECT 流程卡号 as process_id,
               层 as technology_number,
               总层数 as TotalFloors,
               规格 as TotalNumber,
               数量 as quantity,
               形状 as shape,
               项目 as project,
               单片名称 as glass_child,
               面积 as area,
               GlassType as glassType,
               patch_state
        FROM pp.v_optimize_process_normal where
                CONCAT( JSON_UNQUOTE( JSON_EXTRACT( GlassType, '$.thickness' )), JSON_UNQUOTE( JSON_EXTRACT( GlassType, '$.color' )) )= #{optionVal}
        order by deliveryDate desc
    </select>