north-glass-erp/northglass-erp/src/views/pp/glassOptimize/GlassComputed.vue
@@ -107,9 +107,37 @@ merge: item.merge, glass_details: [] }; request.post(`/glassOptimize/selectComputeDetail/${item.processId}/${item.technologyNumber}/${item.patch_state}`).then((res) => { if(Number(res.code) === 200){ processCard.glass_details=res.data.data res.data.data.forEach(items=>{ const detail={ process_id:null, technology_number:null, order_number:null, layers_number:null, max_width:null, max_height:null, child_width:null, child_height:null, quantity:null, patch_state:null } detail.process_id=items.process_id detail.technology_number=items.technology_number detail.order_number=items.order_number detail.layers_number=item.total_layers detail.max_width=items.maxwidth detail.max_height=items.maxheight detail.child_width=items.width detail.child_height=items.height detail.quantity=items.quantity detail.patch_state=item.patch_state processCard.glass_details.push(detail) }) }else{ ElMessage.warning(res.msg) } @@ -117,6 +145,12 @@ computed.value.process_cards.push(processCard) }) console.log(computed.value) /*request.post(`/glassOptimize/simulationCalculate`,computed.value).then((res) => { if(Number(res.code) === 200){ } })*/ /*try { const responses = await Promise.all(requests);
@@ -312,11 +312,11 @@ <input type="number" v-model="settings.tempering.maxPieceCount" step="1" /> </div> <div class="form-group"> <label>X轴默认间隔(mm)</label> <label>长轴默认间隔(mm)</label> <input type="number" v-model="settings.tempering.xAxisInterval" step="1" /> </div> <div class="form-group"> <label>Y轴默认间隔(mm)</label> <label>宽轴默认间隔(mm)</label> <input type="number" v-model="settings.tempering.yAxisInterval" step="1" /> </div> </div> north-glass-erp/northglass-erp/src/views/pp/glassOptimize/page/Compute.vue
@@ -118,28 +118,13 @@ }) const firstLoading = async() => { request.post(`/glassOptimize/getConfiguration/钢化`).then((res) => { request.post(`/glassOptimize/selectOptimizeParms/${username}`).then((res) => { if (res.code == "200") { const rawData = res.data.data; if (Array.isArray(rawData) && rawData.length > 0) { const formattedData = rawData.map(item => { const formattedItem = {}; for (const key in item) { if (typeof item[key] === 'string') { //去除字符串属性值开头和结尾的双引号 formattedItem[key] = item[key].replace(/^\"|\"$/g, ''); } else { formattedItem[key] = item[key]; } } return formattedItem; }); furnaceWidth.value=formattedData[0].load_width furnaceLength.value=formattedData[0].load_length spacingLong.value=formattedData[0].x_space spacingWidth.value=formattedData[0].y_space } const parsedData = JSON.parse(res.data); furnaceWidth.value=parsedData.tempering.furnaceWidth furnaceLength.value=parsedData.tempering.furnaceLength spacingLong.value=parsedData.tempering.xAxisInterval spacingWidth.value=parsedData.tempering.yAxisInterval } else { ElMessage.warning(res.msg) } @@ -169,7 +154,27 @@ } }) const inputValues = { project_no:inputValue.value, glass_thickness:"", glass_type:"", chaos_pct: optionVal.value*0.01,//混排等级 cage_free:percentage2.value*0.01,//理片龙空闲度 tempering_time:heatingTime.value,//钢化加热时间 heat_mode: 0,//模式选择 max_load_pct: percentage1.value*0.01,//最大装载率 max_area: 0,//最大面积 max_qty:0,//最大片数 load_width:null, load_length: null, x_space: null, y_space: null, load_rate: null, furnaces_qty:"", rotate_mode:0, polys_allow_rotate: 0, process_cards:[] }; // let emit = defineEmits(['fetch-data']); @@ -182,27 +187,13 @@ }; const handleSimulationClick = () => { const inputValues = { project_no:inputValue.value, glass_thickness:"", glass_type:"", chaos_pct: optionVal.value*0.01,//混排等级 cage_free:percentage2.value*0.01,//理片龙空闲度 tempering_time:heatingTime.value,//钢化加热时间 heat_mode: 0,//模式选择 max_load_pct: percentage1.value*0.01,//最大装载率 max_area: 0,//最大面积 max_qty:0,//最大片数 load_width:furnaceWidth.value, load_length: furnaceLength.value, x_space: spacingWidth.value, y_space: spacingLong.value, load_rate: null, furnaces_qty:"", rotate_mode:0, polys_allow_rotate: rotateMode.value, process_cards:[] }; inputValues.load_width = furnaceWidth.value inputValues.load_length = furnaceLength.value inputValues.x_space = spacingWidth.value inputValues.y_space = spacingLong.value inputValues.polys_allow_rotate = parseInt(rotateMode.value.value) emit('sendData', { ...inputValues }) north-glass-erp/src/main/java/com/example/erp/service/pp/GlassOptimizeService.java
@@ -45,10 +45,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("6"); rabbitMQUtil.sendMessage(message.toString()); System.out.println("send message: " + message); String date = rabbitMQUtil.receiveMessages(); System.out.println("Received message: " + date);
