From 967b1b51f17b94b9aaa6264d14266a73d48416ed Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 22 六月 2022 14:14:32 +0800
Subject: [PATCH] #
---
static/js/object/CrnTask.js | 70 +++++++++++++++++++++++++---------
1 files changed, 51 insertions(+), 19 deletions(-)
diff --git a/static/js/object/CrnTask.js b/static/js/object/CrnTask.js
index 0acf3d2..befe7e7 100644
--- a/static/js/object/CrnTask.js
+++ b/static/js/object/CrnTask.js
@@ -33,6 +33,7 @@
that.preZ = 0;
that.prePosition = null;
that.preForkPos = -1; // -1, "涓嶅湪瀹氫綅" 0, "璐у弶鍘熶綅" 1, "璐у弶鍦ㄥ乏渚ц繙" 2, "璐у弶鍦ㄥ乏渚�" 3, "璐у弶鍦ㄥ彸渚�" 4, "璐у弶鍦ㄥ彸渚ц繙"
+ that.preLoadPos = -1;
// 褰撳墠鏁版嵁
that.bay = 1 ;
that.lev = 1 ;
@@ -41,6 +42,7 @@
that.z = 0;
that.position = null;
that.forkPos = -1;
+ that.loadPos = -1;
that.crnBody = null;
that.crnLoad = null;
@@ -49,6 +51,7 @@
that.pallet = null;
that.goods = null;
+ that.wrkNo = null;
that.sourceLocNo = null;
that.locNo = null;
@@ -63,6 +66,7 @@
that.z = crnData.position.z;
that.position = crnData.position;
that.forkPos = crnData.forkPos;
+ that.loadPos = crnData.loadPos;
that.crnBody = getArrVal(object.objects, "name", that.crnNo + "-body");
that.crnLoad = getArrVal(object.objects, "name", that.crnNo + "-load");
@@ -81,23 +85,27 @@
}
if (that.crnBody===null) {
that.crnBody = getArrVal(object.objects, "name", that.crnNo + "-body");
- // return;
+ return;
}
if (that.crnLoad===null) {
that.crnLoad = getArrVal(object.objects, "name", that.crnNo + "-load");
- // return;
+ return;
}
if (that.crnFork===null) {
that.crnFork = getArrVal(object.objects, "name", that.crnNo + "-fork");
- // return;
+ return;
}
+
+ // 鍑哄簱 / 绉诲簱
if (crnData.sourceLocNo != null) {
- that.sourceLocNo = crnData.sourceLocNo;
that.pallet = getArrVal(object.objects, "name", crnData.sourceLocNo + "-Pallet");
that.goods = getArrVal(object.objects, "name", crnData.sourceLocNo + "-Goods");
- }
- if (crnData.locNo != null) {
- that.locNo = crnData.locNo;
+ } else {
+ // 鍏ュ簱
+ if (crnData.wrkNo != null) {
+ that.pallet = getArrVal(object.objects, "name", crnData.wrkNo + "-Pallet");
+ that.goods = getArrVal(object.objects, "name", crnData.wrkNo + "-Goods");
+ }
}
if (JSON.stringify(crnData.position) === JSON.stringify(that.position)) {
@@ -112,6 +120,7 @@
that.preZ = that.z;
that.prePosition = JSON.parse(JSON.stringify(that.position));
that.preForkPos = that.forkPos;
+ that.preLoadPos = that.loadPos;
// 褰撳墠
that.bay = crnData.bay;
that.lev = crnData.lev;
@@ -120,6 +129,38 @@
that.z = crnData.position.z;
that.position = crnData.position;
that.forkPos = crnData.forkPos;
+ that.loadPos = crnData.loadPos;
+ that.sourceLocNo = crnData.sourceLocNo;
+ that.locNo = crnData.locNo;
+ that.wrkNo = crnData.wrkNo;
+
+ // 鏍规嵁璐у弶涓婁笅瀹氫綅 鍒ゆ柇鍫嗗灈鏈哄彇鏀捐揣浣滀笟 -----------------------------------------------
+
+ // 涓婂畾浣� ===>> 涓嬪畾浣� 鏀捐揣瀹屾垚
+ if (that.preLoadPos === 1 && that.loadPos === 0) {
+ // 鍏ュ簱 / 绉诲簱
+ if (that.locNo != null) {
+ if (that.pallet != null) {
+ that.pallet.name = that.locNo + "-Pallet";
+ }
+ if (that.goods != null) {
+ that.goods.name = that.locNo + "-Goods";
+ }
+ } else {
+ // 鍑哄簱
+ if (crnData.wrkNo != null) {
+ if (that.pallet != null) {
+ that.pallet.name = crnData.wrkNo + "-Pallet";
+ }
+ if (that.goods != null) {
+ that.goods.name = crnData.wrkNo + "-Goods";
+ }
+ }
+ }
+ // 涓嬪畾浣� ===>> 涓婂畾浣� 鍙栬揣瀹屾垚
+ } else {
+
+ }
// create Route ------------------------------------------------
@@ -130,6 +171,7 @@
progress: 0,
part: 'fork',
loaded: crnData.loaded,
+ loadPos: crnData.loadPos,
route: new Route([
{
x: that.prePosition.x,
@@ -170,7 +212,6 @@
curves.map((value, index) => {
if (that.crnNo === 1) {
- // console.log(crnData)
// console.log(value.part + " --> " + JSON.stringify(value.route.points))
}
});
@@ -189,15 +230,6 @@
if (i !== curves.length - 1) {
curves[i+1].start = true;
} else {
- // if (that.locNo != null) {
- // if (that.pallet != null) {
- // that.pallet.name = that.locNo + "-Pallet";
- // }
- // if (that.goods != null) {
- // that.goods.name = that.locNo + "-Goods";
- // }
- // }
- // reset
curves = [];
that.run = false;
}
@@ -216,8 +248,8 @@
break
case 'fork':
that.crnFork.position.set(point.x + xOffset1, point.y, point.z);
- // todo:luxiaotao 鎵樼洏+璐х墿 杩愬姩 涓嶆槸鏍规嵁loaded锛屾槸鏍规嵁涓婁笅瀹氫綅
- if (curves[i].loaded === 1 && that.pallet) {
+ // console.log("loadPos:" + curves[i].loadPos + "\n" + that.pallet);
+ if (curves[i].loadPos === 1 && that.pallet) {
that.pallet.position.setX(point.x + palletX);
that.goods.position.setX(point.x + goodsX);
}
--
Gitblit v1.9.1