From ce49fdd43a76a380ed782e882280d7d1c32dee79 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 18 二月 2022 15:59:08 +0800
Subject: [PATCH] #
---
static/js/object/CrnTask.js | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 48 insertions(+), 3 deletions(-)
diff --git a/static/js/object/CrnTask.js b/static/js/object/CrnTask.js
index c1e114e..751ae59 100644
--- a/static/js/object/CrnTask.js
+++ b/static/js/object/CrnTask.js
@@ -11,6 +11,14 @@
const yOffset1 = -116;
const zOffset1 = -475;
+const palletX = -18;
+const palletY = 2;
+const palletZ = -46;
+
+const goodsX = -17;
+const goodsY = 5;
+const goodsZ = -6;
+
// 鍫嗗灈鏈哄綋鍓嶈繍琛岀姸鎬佸璞�
function CrnTask(crnData, object) {
let that = this;
@@ -38,6 +46,12 @@
that.crnLoad = null;
that.crnFork = null;
+ that.pallet = null;
+ that.goods = null;
+
+ that.sourceLocNo = null;
+ that.locNo = null;
+
let curves = [];
let init = function () {
@@ -53,6 +67,7 @@
that.crnBody = getArrVal(object.objects, "name", that.crnNo + "-body");
that.crnLoad = getArrVal(object.objects, "name", that.crnNo + "-load");
that.crnFork = getArrVal(object.objects, "name", that.crnNo + "-fork");
+
if (that.crnBody===null || that.crnLoad===null || that.crnFork==null) {
// console.log(that.crnNo + "鍙峰爢鍨涙満娌℃湁鍒濆鍖�");
}
@@ -66,16 +81,25 @@
}
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;
+ }
+
if (JSON.stringify(crnData.position) === JSON.stringify(that.position)) {
return;
}
@@ -105,6 +129,7 @@
start: false,
progress: 0,
part: 'fork',
+ loaded: crnData.loaded,
route: new Route([
{
x: that.prePosition.x,
@@ -126,6 +151,7 @@
start: false,
progress: 0,
part: 'load',
+ loaded: crnData.loaded,
route: new Route([
{
x: that.crnLoad.position.x,
@@ -143,6 +169,7 @@
curves.map((value, index) => {
if (that.crnNo === 1) {
+ // console.log(crnData)
// console.log(value.part + " --> " + JSON.stringify(value.route.points))
}
});
@@ -161,6 +188,15 @@
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;
}
@@ -172,9 +208,18 @@
that.crnBody.position.z = point.z + zOffset - that.crnBody.userData.crnBodyWidth/2;
that.crnLoad.position.set(point.x, point.y + yOffset0, point.z + zOffset0 - that.crnLoad.userData.crnLoadWidth/2 + 5);
that.crnFork.position.set(point.x, point.y + yOffset1, point.z + zOffset1 - that.crnLoad.userData.crnLoadWidth/2);
+ if (curves[i].loaded === 1 && that.pallet) {
+ that.pallet.position.set(point.x - xOffset + palletX, point.y + palletY, point.z + palletZ);
+ that.goods.position.set(point.x - xOffset + goodsX, point.y + goodsY, point.z + goodsZ);
+ }
break
case 'fork':
that.crnFork.position.set(point.x + xOffset1, point.y, point.z);
+ // todo:luxiaotao 鎵樼洏+璐х墿 杩愬姩 涓嶆槸鏍规嵁loaded锛屾槸鏍规嵁涓婁笅瀹氫綅
+ if (curves[i].loaded === 1 && that.pallet) {
+ that.pallet.position.setX(point.x + palletX);
+ that.goods.position.setX(point.x + goodsX);
+ }
break
default:
break
--
Gitblit v1.9.1