From 8a7e936b92038a9e5c7de3e1314c43f1346202c1 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 01 八月 2024 15:02:29 +0800
Subject: [PATCH] 大理片笼出片逻辑调整：1、尺寸限制 2、fixbug:玻璃重复进出，造成按照历史任务查询笼内玻璃尺寸返回多条记录sql查询异常 3、对列表在新增数据前先按照玻璃id对历史数据进行删除后新增，保证对列表数据唯一，防止大理片笼进片异常
---
UI-Project/src/views/PurchaseReturn/purchaseReturn.vue | 78 ++++++++++++++++++++++++++-------------
1 files changed, 52 insertions(+), 26 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index 44b5882..3ab4e62 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -37,23 +37,36 @@
widtha = rect.width;
heighta = rect.height;
}
- if (rect.angle === 0) {
- adjustedWidth = heighta * 0.12;
- adjustedHeight = widtha * 0.1;
- adjustedWidtha = heighta;
- adjustedHeighta = widtha;
- newX = 5087 - (rect.xCoordinate + heighta);
- } else {
- adjustedWidth = widtha * 0.12;
- adjustedHeight = heighta * 0.1;
- adjustedWidtha = widtha;
- adjustedHeighta = heighta;
- newX = 5087 - (rect.xCoordinate + widtha);
- }
+ if (rect.angle === 0) {
+ adjustedWidth = widtha * 0.12;
+ adjustedHeight = heighta * 0.1;
+ adjustedWidtha = widtha;
+ adjustedHeighta = heighta;
+ newX = 5087 - (rect.yCoordinate + widtha);
+ } else {
+ adjustedWidth = heighta * 0.12;
+ adjustedHeight = widtha * 0.1;
+ adjustedWidtha = heighta;
+ adjustedHeighta = widtha;
+ newX = 5087 - (rect.yCoordinate + heighta);
+ }
+ // if (rect.angle === 0) {
+ // adjustedWidth = heighta * 0.12;
+ // adjustedHeight = widtha * 0.1;
+ // adjustedWidtha = heighta;
+ // adjustedHeighta = widtha;
+ // newX = 5087 - (rect.xCoordinate + heighta);
+ // } else {
+ // adjustedWidth = widtha * 0.12;
+ // adjustedHeight = heighta * 0.1;
+ // adjustedWidtha = widtha;
+ // adjustedHeighta = heighta;
+ // newX = 5087 - (rect.xCoordinate + widtha);
+ // }
return {
...rect,
xcoordinate: newX * 0.12,
- ycoordinate: rect.yCoordinate * 0.1,
+ ycoordinate: rect.xCoordinate * 0.1,
width: adjustedWidth,
height: adjustedHeight,
widtha: adjustedWidtha,
@@ -76,22 +89,35 @@
heighta = rect.height;
}
if (rect.angle === 0) {
- adjustedWidth = heighta * 0.12;
- adjustedHeight = widtha * 0.1;
- adjustedWidtha = heighta;
- adjustedHeighta = widtha;
- newX = 5087 - (rect.xCoordinate + heighta);
- } else {
- adjustedWidth = widtha * 0.12;
- adjustedHeight = heighta * 0.1;
- adjustedWidtha = widtha;
- adjustedHeighta = heighta;
- newX = 5087 - (rect.xCoordinate + widtha);
+ adjustedWidth = widtha * 0.12;
+ adjustedHeight = heighta * 0.1;
+ adjustedWidtha = widtha;
+ adjustedHeighta = heighta;
+ newX = 5087 - (rect.yCoordinate + widtha);
+ } else {
+ adjustedWidth = heighta * 0.12;
+ adjustedHeight = widtha * 0.1;
+ adjustedWidtha = heighta;
+ adjustedHeighta = widtha;
+ newX = 5087 - (rect.yCoordinate + heighta);
}
+ // if (rect.angle === 0) {
+ // adjustedWidth = heighta * 0.12;
+ // adjustedHeight = widtha * 0.1;
+ // adjustedWidtha = heighta;
+ // adjustedHeighta = widtha;
+ // newX = 5087 - (rect.xCoordinate + heighta);
+ // } else {
+ // adjustedWidth = widtha * 0.12;
+ // adjustedHeight = heighta * 0.1;
+ // adjustedWidtha = widtha;
+ // adjustedHeighta = heighta;
+ // newX = 5087 - (rect.xCoordinate + widtha);
+ // }
return {
...rect,
xcoordinate: newX * 0.12,
- ycoordinate: rect.yCoordinate * 0.1,
+ ycoordinate: rect.xCoordinate * 0.1,
width: adjustedWidth,
height: adjustedHeight,
widtha: adjustedWidtha,
--
Gitblit v1.8.0