From 8f902a43cd8fb6e07605d2db7e35eaaa2f540879 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 06 三月 2023 14:36:02 +0800
Subject: [PATCH] #
---
static/js/object/StaTask.js | 76 ++++++++++++--------------------------
1 files changed, 24 insertions(+), 52 deletions(-)
diff --git a/static/js/object/StaTask.js b/static/js/object/StaTask.js
index c7a7593..4c72efc 100644
--- a/static/js/object/StaTask.js
+++ b/static/js/object/StaTask.js
@@ -7,6 +7,8 @@
that.object = object;
that.no = 0;
+ that.objectType = null;
+ that.isDel = false;
that.readyIn = false;
that.run = false;
that.loaded = 0;
@@ -24,76 +26,46 @@
let item = getArrVal(conveyObjects.objects, "no", that.no+"");
if (!that.position && item) {
+ that.objectType = item.objectType;
that.position = item.position;
+ }
+ if (!item) {
+ that.isDel = true;
}
}
init();
that.modify = function (staData) {
- if (that.run || that.no === 0) {
- console.error(staData.no + "鍙疯緭閫佺嚎鏇存柊澶辫触");
+ if (that.no === 0) {
return;
}
- // 椤甸潰鍒囨崲瀵艰嚧璐х墿瑕嗙洊
- if (that.loaded === 1 && staData.loaded === 1 && staData.wrkNo > 0 && that.wrkNo > 0 && that.wrkNo !== staData.wrkNo) {
- if (that.inlet === 1) {
- // remove
- that.object.removeObject(that.wrkNo + "-Pallet");
- that.object.removeObject(that.wrkNo + "-Goods");
- // add
- InitPallet(that.object, [{wrkNo: staData.wrkNo}], {position: that.position}, 2);
- }
-
- that.readyIn = false;
- }
-
- if (that.loaded === 0 && staData.loaded === 1) {
- that.readyIn = true;
- }
- if (that.readyIn && staData.wrkNo && staData.wrkNo !== '0') {
- // 鏃犺揣 ===>> 鏈夎揣
-
- // 1.鍏ュ簱绗竴绔� 銆愭柊澧炪��
- if (that.inlet === 1) {
- InitPallet(that.object, [{wrkNo: staData.wrkNo}], {position: that.position}, 2);
- InitGoods(that.object, [{wrkNo: staData.wrkNo}], {position: that.position}, 2);
-
- // 2.鏉ヨ嚜鍏朵粬绔欑偣鐨勮揣鐗� 銆愮Щ鍔ㄣ��
- } else {
-
- }
- that.readyIn = false;
- }
-
- if (that.loaded === 1 && staData.loaded === 0) {
- // 鏈夎揣 ===>> 鏃犺揣
-
- // 1.鍑哄簱鏈�鍚庝竴绔� 銆愮Щ闄ゃ��
- if (that.outlet === 1) {
- let pallet = getArrVal(that.object.objects, "name", that.wrkNo + "-Pallet");
- if (pallet != null) {
+ // 娣诲姞
+ if (staData.loaded === 1 && staData.wrkNo && staData.wrkNo !== '0' && that.wrkNo !== staData.wrkNo) {
+ if (that.outlet !== 1) { // 鐢卞爢鍨涙満鍑哄簱锛屼笉闇�瑕佹坊鍔爉odel
+ if (that.loaded === 1) {
+ console.log("sta_" + that.no + " remove锛�" + that.wrkNo + "-Pallet锛� " + that.wrkNo + "-Goods");
that.object.removeObject(that.wrkNo + "-Pallet");
+ that.object.removeObject(that.wrkNo + "-Goods");
}
- let goods = getArrVal(that.object.objects, "name", that.wrkNo + "-Goods");
- if (goods != null) {
+
+ InitPallet(that.object, [{wrkNo: staData.wrkNo}], {position: that.position, objectType: that.objectType}, 2);
+ InitGoods(that.object, [{wrkNo: staData.wrkNo}], {position: that.position, objectType: that.objectType}, 2);
+ }
+ }
+
+ // 绉婚櫎
+ if (staData.loaded === 0) {
+ if (that.loaded === 1 && that.wrkNo && that.wrkNo !== '0') {
+ if (that.inlet !== 1) { // 鍫嗗灈鏈洪渶瑕佹惉杩愶紝涓嶈兘鐩存帴绉婚櫎
+ that.object.removeObject(that.wrkNo + "-Pallet");
that.object.removeObject(that.wrkNo + "-Goods");
}
}
- that.readyIn = false;
}
- // 瀹炴椂鏇存柊
that.loaded = staData.loaded;
that.wrkNo = staData.wrkNo;
- // that.run = true;
-
- }
-
- that.change = function () {
-
-
-
}
}
--
Gitblit v1.9.1