@fmsim/machine 2.0.0-beta.6 → 2.0.0-beta.61
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/agv.js +2 -2
- package/dist/agv.js.map +1 -1
- package/dist/carrier-manager.js +93 -0
- package/dist/carrier-manager.js.map +1 -0
- package/dist/carrier.js +49 -4
- package/dist/carrier.js.map +1 -1
- package/dist/conveyor-join.js +8 -2
- package/dist/conveyor-join.js.map +1 -1
- package/dist/conveyor.js +8 -0
- package/dist/conveyor.js.map +1 -1
- package/dist/crane.js.map +1 -1
- package/dist/factories/agv-3d.js +8 -9
- package/dist/factories/agv-3d.js.map +1 -1
- package/dist/factories/conveyor-3d.js +166 -81
- package/dist/factories/conveyor-3d.js.map +1 -1
- package/dist/factories/crane-3d.js +5 -7
- package/dist/factories/crane-3d.js.map +1 -1
- package/dist/factories/crane-rail-3d.js +4 -6
- package/dist/factories/crane-rail-3d.js.map +1 -1
- package/dist/factories/machine-3d.js +363 -132
- package/dist/factories/machine-3d.js.map +1 -1
- package/dist/factories/oht-3d.js +20 -20
- package/dist/factories/oht-3d.js.map +1 -1
- package/dist/factories/shuttle-3d.js +2 -5
- package/dist/factories/shuttle-3d.js.map +1 -1
- package/dist/features/mcs-status-mixin.js +22 -0
- package/dist/features/mcs-status-mixin.js.map +1 -1
- package/dist/index.js +50 -34
- package/dist/index.js.map +1 -1
- package/dist/mcs-carrier-holder.js +39 -22
- package/dist/mcs-carrier-holder.js.map +1 -1
- package/dist/mcs-vehicle.js +8 -3
- package/dist/mcs-vehicle.js.map +1 -1
- package/dist/node.js +1 -1
- package/dist/node.js.map +1 -1
- package/dist/oht.js.map +1 -1
- package/dist/scanner.js +30 -0
- package/dist/scanner.js.map +1 -0
- package/dist/scene/root-container-override.js +9 -0
- package/dist/scene/root-container-override.js.map +1 -1
- package/dist/stocker-abnormal-bar.js +1 -1
- package/dist/stocker-abnormal-bar.js.map +1 -1
- package/dist/stocker-capacity-bar.js +3 -3
- package/dist/stocker-capacity-bar.js.map +1 -1
- package/dist/stocker-carrier-bar.js +1 -1
- package/dist/stocker-carrier-bar.js.map +1 -1
- package/dist/templates/index.js +2 -0
- package/dist/templates/index.js.map +1 -1
- package/dist/templates/scanner.js +20 -0
- package/dist/templates/scanner.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/utils/get-value-on-ranges.js +2 -4
- package/dist/utils/get-value-on-ranges.js.map +1 -1
- package/dist/zone-capacity-bar.js +3 -3
- package/dist/zone-capacity-bar.js.map +1 -1
- package/jest.config.js +10 -0
- package/package.json +4 -3
- package/src/agv.ts +2 -2
- package/src/carrier-manager.ts +117 -0
- package/src/carrier.ts +48 -2
- package/src/conveyor-join.ts +5 -2
- package/src/conveyor.ts +8 -0
- package/src/crane.ts +1 -1
- package/src/factories/agv-3d.ts +9 -10
- package/src/factories/conveyor-3d.ts +168 -84
- package/src/factories/crane-3d.ts +6 -8
- package/src/factories/crane-rail-3d.ts +5 -7
- package/src/factories/machine-3d.ts +428 -144
- package/src/factories/oht-3d.ts +20 -20
- package/src/factories/shuttle-3d.ts +2 -6
- package/src/features/mcs-status-mixin.ts +21 -0
- package/src/index.ts +56 -34
- package/src/mcs-carrier-holder.ts +38 -34
- package/src/mcs-vehicle.ts +9 -6
- package/src/node.ts +1 -1
- package/src/oht.ts +1 -1
- package/src/scanner.ts +29 -0
- package/src/scene/root-container-override.ts +12 -0
- package/src/stocker-abnormal-bar.ts +1 -1
- package/src/stocker-capacity-bar.ts +3 -3
- package/src/stocker-carrier-bar.ts +1 -1
- package/src/templates/index.ts +2 -0
- package/src/templates/scanner.ts +20 -0
- package/src/utils/get-value-on-ranges.ts +2 -4
- package/src/zone-capacity-bar.ts +3 -3
- package/translations/en.json +2 -1
- package/translations/ja.json +2 -1
- package/translations/ko.json +2 -1
- package/translations/ms.json +2 -1
- package/translations/zh.json +2 -1
package/src/factories/oht-3d.ts
CHANGED
|
@@ -30,9 +30,9 @@ export class OHT3D extends RealObjectGroup {
|
|
|
30
30
|
return depth || TRANSPORT_SURFACE_HEIGHT
|
|
31
31
|
}
|
|
32
32
|
|
|
33
|
-
/** 천장 레일 높이에 배치 */
|
|
33
|
+
/** 천장 레일 높이에 배치 (center origin 기준: 레일 높이 + 볼륨 중심 반깊이) */
|
|
34
34
|
protected get syncZPosOffset(): number {
|
|
35
|
-
return OHT_RAIL_HEIGHT
|
|
35
|
+
return OHT_RAIL_HEIGHT + this.effectiveDepth / 2
|
|
36
36
|
}
|
|
37
37
|
|
|
38
38
|
private resolveColor(): number {
|
|
@@ -83,7 +83,7 @@ export class OHT3D extends RealObjectGroup {
|
|
|
83
83
|
metalness: 0.4,
|
|
84
84
|
})
|
|
85
85
|
|
|
86
|
-
// ── 1. 하단 그리퍼 바 (캐리어를 집는 가로 바) ──
|
|
86
|
+
// ── 1. 하단 그리퍼 바 (캐리어를 집는 가로 바 — 이동 방향과 직교) ──
|
|
87
87
|
const gripperBarW = w * 0.7
|
|
88
88
|
const gripperBarD = h * 0.15
|
|
89
89
|
const gripperGeo = new THREE.BoxGeometry(gripperBarW, gripperBarH, gripperBarD)
|
|
@@ -91,21 +91,21 @@ export class OHT3D extends RealObjectGroup {
|
|
|
91
91
|
gripperMesh.position.y = gripperBarH / 2
|
|
92
92
|
gripperMesh.castShadow = true
|
|
93
93
|
|
|
94
|
-
// ── 2. 호이스트 암 (
|
|
94
|
+
// ── 2. 호이스트 암 (전후 수직 기둥 + 하단 연결 바) ──
|
|
95
95
|
const armBaseY = gripperBarH
|
|
96
96
|
const armGeometries: THREE.BufferGeometry[] = []
|
|
97
97
|
|
|
98
|
-
//
|
|
99
|
-
for (const
|
|
98
|
+
// 전후 수직 기둥 (레일 방향 = Z축)
|
|
99
|
+
for (const zSign of [-1, 1]) {
|
|
100
100
|
const pillar = new THREE.BoxGeometry(armThickness, armH, armThickness)
|
|
101
|
-
pillar.translate(
|
|
101
|
+
pillar.translate(0, armBaseY + armH / 2, zSign * (h * 0.3))
|
|
102
102
|
armGeometries.push(pillar)
|
|
103
103
|
}
|
|
104
104
|
|
|
105
|
-
// 하단
|
|
106
|
-
const
|
|
105
|
+
// 하단 연결 바 (레일 방향으로 연결)
|
|
106
|
+
const crossBarD = h * 0.6 + armThickness
|
|
107
107
|
const crossBarH = armThickness * 0.6
|
|
108
|
-
const crossBar = new THREE.BoxGeometry(
|
|
108
|
+
const crossBar = new THREE.BoxGeometry(armThickness, crossBarH, crossBarD)
|
|
109
109
|
crossBar.translate(0, armBaseY + crossBarH / 2, 0)
|
|
110
110
|
armGeometries.push(crossBar)
|
|
111
111
|
|
|
@@ -126,10 +126,10 @@ export class OHT3D extends RealObjectGroup {
|
|
|
126
126
|
bodyMesh.castShadow = true
|
|
127
127
|
bodyMesh.receiveShadow = true
|
|
128
128
|
|
|
129
|
-
// ── 4. 상단 트롤리 플레이트 (
|
|
129
|
+
// ── 4. 상단 트롤리 플레이트 (레일 방향으로 길게 — Z축) ──
|
|
130
130
|
const trolleyBaseY = bodyBaseY + bodyH + gap
|
|
131
|
-
const trolleyW = w *
|
|
132
|
-
const trolleyD = h *
|
|
131
|
+
const trolleyW = w * 0.6
|
|
132
|
+
const trolleyD = h * 1.15
|
|
133
133
|
const trolleyGeo = new THREE.BoxGeometry(trolleyW, trolleyH, trolleyD)
|
|
134
134
|
const trolleyMat = new THREE.MeshStandardMaterial({
|
|
135
135
|
color: TROLLEY_COLOR,
|
|
@@ -140,29 +140,29 @@ export class OHT3D extends RealObjectGroup {
|
|
|
140
140
|
trolleyMesh.position.y = trolleyBaseY + trolleyH / 2
|
|
141
141
|
trolleyMesh.castShadow = true
|
|
142
142
|
|
|
143
|
-
// ── 5.
|
|
143
|
+
// ── 5. 전후 바퀴 (트롤리 위, 레일 방향 = Z축) ──
|
|
144
144
|
const wheelBaseY = trolleyBaseY + trolleyH
|
|
145
145
|
const wheelRadius = wheelH / 2
|
|
146
|
-
const wheelDepth =
|
|
146
|
+
const wheelDepth = w * 0.2
|
|
147
147
|
const wheelMeshes: THREE.Mesh[] = []
|
|
148
|
-
for (const
|
|
148
|
+
for (const zSign of [-1, 1]) {
|
|
149
149
|
const wheelGeo = new THREE.CylinderGeometry(wheelRadius, wheelRadius, wheelDepth, 12)
|
|
150
|
-
wheelGeo.
|
|
150
|
+
wheelGeo.rotateZ(Math.PI / 2)
|
|
151
151
|
const wheelMesh = new THREE.Mesh(wheelGeo, trolleyMat)
|
|
152
|
-
wheelMesh.position.set(
|
|
152
|
+
wheelMesh.position.set(0, wheelBaseY + wheelRadius, zSign * (trolleyD * 0.35))
|
|
153
153
|
wheelMesh.castShadow = true
|
|
154
154
|
wheelMeshes.push(wheelMesh)
|
|
155
155
|
}
|
|
156
156
|
|
|
157
157
|
this._ownMeshes = [gripperMesh, armMesh, bodyMesh, trolleyMesh, ...wheelMeshes]
|
|
158
|
-
for (const m of this._ownMeshes) this.
|
|
158
|
+
for (const m of this._ownMeshes) this.components3D.add(m)
|
|
159
159
|
}
|
|
160
160
|
|
|
161
161
|
updateDimension() {}
|
|
162
162
|
|
|
163
163
|
update() {
|
|
164
164
|
for (const m of this._ownMeshes) {
|
|
165
|
-
this.
|
|
165
|
+
this.components3D.remove(m)
|
|
166
166
|
disposeObject3D(m)
|
|
167
167
|
}
|
|
168
168
|
this._ownMeshes = []
|
|
@@ -27,10 +27,6 @@ export class Shuttle3D extends RealObjectGroup {
|
|
|
27
27
|
return depth || TRANSPORT_SURFACE_HEIGHT
|
|
28
28
|
}
|
|
29
29
|
|
|
30
|
-
protected get syncZPosOffset(): number {
|
|
31
|
-
return 0
|
|
32
|
-
}
|
|
33
|
-
|
|
34
30
|
private resolveColor(): number {
|
|
35
31
|
const comp = this.component as any
|
|
36
32
|
|
|
@@ -142,14 +138,14 @@ export class Shuttle3D extends RealObjectGroup {
|
|
|
142
138
|
forkMesh.castShadow = true
|
|
143
139
|
|
|
144
140
|
this._ownMeshes = [baseMesh, mastMesh, forkMesh]
|
|
145
|
-
for (const m of this._ownMeshes) this.
|
|
141
|
+
for (const m of this._ownMeshes) this.components3D.add(m)
|
|
146
142
|
}
|
|
147
143
|
|
|
148
144
|
updateDimension() {}
|
|
149
145
|
|
|
150
146
|
update() {
|
|
151
147
|
for (const m of this._ownMeshes) {
|
|
152
|
-
this.
|
|
148
|
+
this.components3D.remove(m)
|
|
153
149
|
disposeObject3D(m)
|
|
154
150
|
}
|
|
155
151
|
this._ownMeshes = []
|
|
@@ -53,5 +53,26 @@ export function MCSStatusMixin<TBase extends Constructor>(Base: TBase) {
|
|
|
53
53
|
|
|
54
54
|
return (status && legend && (legend[status] || legend[status!] || legend.default)) || legend?.default
|
|
55
55
|
}
|
|
56
|
+
|
|
57
|
+
/**
|
|
58
|
+
* 데이터 변경 시 status 기반 색상을 state.fillStyle 로 반영.
|
|
59
|
+
* things-scene 표준 경로(updateFillStyle)가 2D/3D 모두 자동 갱신하도록 유도.
|
|
60
|
+
*
|
|
61
|
+
* 주의: state.fillStyle 이 runtime 색상으로 덮어써짐. 모델 저장 시 status 색상이
|
|
62
|
+
* 남을 수 있는 트레이드오프가 있음 (data-driven 컴포넌트의 fillStyle 은 의미상
|
|
63
|
+
* 초기값일 뿐 항상 status 가 덮어쓰는 것이 자연스러움).
|
|
64
|
+
*/
|
|
65
|
+
onchangeData(after: any, before: any) {
|
|
66
|
+
// Base (mixin 인자) 의 onchangeData 를 렉시컬하게 호출.
|
|
67
|
+
// Object.getPrototypeOf(this) 는 leaf 를 가리켜 무한재귀되므로 Base.prototype 직접 사용.
|
|
68
|
+
const baseOnchange = (Base.prototype as any).onchangeData
|
|
69
|
+
if (typeof baseOnchange === 'function') {
|
|
70
|
+
baseOnchange.call(this, after, before)
|
|
71
|
+
}
|
|
72
|
+
const color = this.statusColor
|
|
73
|
+
if (color && color !== (this as any).state?.fillStyle) {
|
|
74
|
+
;(this as any).setState('fillStyle', color)
|
|
75
|
+
}
|
|
76
|
+
}
|
|
56
77
|
}
|
|
57
78
|
}
|
package/src/index.ts
CHANGED
|
@@ -1,55 +1,72 @@
|
|
|
1
1
|
// ── side-effect: scene override ──
|
|
2
|
-
import './scene/root-container-override
|
|
2
|
+
import './scene/root-container-override'
|
|
3
3
|
|
|
4
4
|
// ── side-effect: 3D factories ──
|
|
5
|
-
import './factories/machine-3d
|
|
6
|
-
import './factories/conveyor-3d
|
|
7
|
-
import './factories/agv-3d
|
|
8
|
-
import './factories/oht-3d
|
|
9
|
-
import './factories/shuttle-3d
|
|
10
|
-
import './factories/crane-3d
|
|
11
|
-
import './factories/crane-rail-3d
|
|
5
|
+
import './factories/machine-3d'
|
|
6
|
+
import './factories/conveyor-3d'
|
|
7
|
+
import './factories/agv-3d'
|
|
8
|
+
import './factories/oht-3d'
|
|
9
|
+
import './factories/shuttle-3d'
|
|
10
|
+
import './factories/crane-3d'
|
|
11
|
+
import './factories/crane-rail-3d'
|
|
12
12
|
|
|
13
13
|
// ── side-effect: @sceneComponent 등록 (tree-shaking 방지) ──
|
|
14
|
-
|
|
15
|
-
import './
|
|
16
|
-
import './stocker-
|
|
17
|
-
import './stocker-
|
|
18
|
-
import './
|
|
19
|
-
import './
|
|
20
|
-
import './buffer.js'
|
|
21
|
-
import './conveyor.js'
|
|
22
|
-
import './conveyor-join.js'
|
|
23
|
-
import './equipment.js'
|
|
24
|
-
import './oht-line.js'
|
|
25
|
-
import './stocker.js'
|
|
26
|
-
import './crane-rail.js'
|
|
27
|
-
import './agv.js'
|
|
28
|
-
import './oht.js'
|
|
29
|
-
import './shuttle.js'
|
|
30
|
-
import './port.js'
|
|
31
|
-
import './crane.js'
|
|
32
|
-
import './shelf.js'
|
|
33
|
-
import './carrier.js'
|
|
34
|
-
import './node.js'
|
|
35
|
-
import './node-path.js'
|
|
36
|
-
import './floating-container.js'
|
|
37
|
-
import './static-container.js'
|
|
38
|
-
import './clickable-popup.js'
|
|
14
|
+
// bars & overlays
|
|
15
|
+
import './zone-capacity-bar'
|
|
16
|
+
import './stocker-capacity-bar'
|
|
17
|
+
import './stocker-carrier-bar'
|
|
18
|
+
import './stocker-abnormal-bar'
|
|
19
|
+
import './port-flow'
|
|
39
20
|
|
|
21
|
+
// facilities
|
|
22
|
+
import './agv-line'
|
|
23
|
+
import './buffer'
|
|
24
|
+
import './conveyor'
|
|
25
|
+
import './conveyor-join'
|
|
26
|
+
import './equipment'
|
|
27
|
+
import './oht-line'
|
|
28
|
+
import './stocker'
|
|
29
|
+
import './crane-rail'
|
|
30
|
+
import './scanner'
|
|
31
|
+
|
|
32
|
+
// vehicles
|
|
33
|
+
import './agv'
|
|
34
|
+
import './oht'
|
|
35
|
+
import './shuttle'
|
|
36
|
+
|
|
37
|
+
// units
|
|
38
|
+
import './port'
|
|
39
|
+
import './crane'
|
|
40
|
+
import './shelf'
|
|
41
|
+
import './carrier'
|
|
42
|
+
|
|
43
|
+
// topology
|
|
44
|
+
import './node'
|
|
45
|
+
import './node-path'
|
|
46
|
+
|
|
47
|
+
// containers
|
|
48
|
+
import './floating-container'
|
|
49
|
+
import './static-container'
|
|
50
|
+
import './clickable-popup'
|
|
51
|
+
|
|
52
|
+
// ── groups ──
|
|
40
53
|
export { default as MachineGroups } from './groups'
|
|
41
54
|
|
|
55
|
+
// ── base classes ──
|
|
42
56
|
export { default as MCSMachine } from './mcs-machine'
|
|
43
57
|
export { default as MCSUnit } from './mcs-unit'
|
|
44
58
|
export { default as MCSCarrierHolder } from './mcs-carrier-holder'
|
|
45
59
|
export { default as MCSVehicle } from './mcs-vehicle'
|
|
46
60
|
export { default as MCSTransport } from './mcs-transport'
|
|
61
|
+
|
|
62
|
+
// ── bars & overlays ──
|
|
47
63
|
export { default as ZoneCapacityBar } from './zone-capacity-bar'
|
|
48
64
|
export { default as StockerCapacityBar } from './stocker-capacity-bar'
|
|
49
65
|
export { default as StockerCarrierBar } from './stocker-carrier-bar'
|
|
50
66
|
export { default as StockerAbnormalBar } from './stocker-abnormal-bar'
|
|
51
67
|
export { default as PortFlow } from './port-flow'
|
|
52
68
|
|
|
69
|
+
// ── facilities ──
|
|
53
70
|
export { default as AGVLine } from './agv-line'
|
|
54
71
|
export { default as Buffer } from './buffer'
|
|
55
72
|
export { default as Conveyor } from './conveyor'
|
|
@@ -58,19 +75,24 @@ export { default as Equipment } from './equipment'
|
|
|
58
75
|
export { default as OHTLine } from './oht-line'
|
|
59
76
|
export { default as Stocker } from './stocker'
|
|
60
77
|
export { default as CraneRail } from './crane-rail'
|
|
78
|
+
export { default as Scanner } from './scanner'
|
|
61
79
|
|
|
80
|
+
// ── vehicles ──
|
|
62
81
|
export { default as AGV } from './agv'
|
|
63
82
|
export { default as OHT } from './oht'
|
|
64
83
|
export { default as Shuttle } from './shuttle'
|
|
65
84
|
|
|
85
|
+
// ── units ──
|
|
66
86
|
export { default as Port } from './port'
|
|
67
87
|
export { default as Crane } from './crane'
|
|
68
88
|
export { default as Shelf } from './shelf'
|
|
69
89
|
export { default as Carrier } from './carrier'
|
|
70
90
|
|
|
91
|
+
// ── topology ──
|
|
71
92
|
export { default as Node } from './node'
|
|
72
93
|
export { default as NodePath } from './node-path'
|
|
73
94
|
|
|
95
|
+
// ── containers ──
|
|
74
96
|
export { default as FloatingContainer } from './floating-container'
|
|
75
|
-
export { default as StaticContainer } from './static-container
|
|
97
|
+
export { default as StaticContainer } from './static-container'
|
|
76
98
|
export { default as ClickablePopup } from './clickable-popup'
|
|
@@ -1,7 +1,5 @@
|
|
|
1
|
-
import { Model, Properties } from '@hatiolab/things-scene'
|
|
2
1
|
import { themesColorMap, themesAnimationMap } from '@fmsim/api'
|
|
3
2
|
import MCSUnit from './mcs-unit.js'
|
|
4
|
-
import Carrier from './carrier.js'
|
|
5
3
|
|
|
6
4
|
export default class MCSCarrierHolder extends MCSUnit {
|
|
7
5
|
static get properties(): any {
|
|
@@ -31,50 +29,56 @@ export default class MCSCarrierHolder extends MCSUnit {
|
|
|
31
29
|
]
|
|
32
30
|
}
|
|
33
31
|
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
super.ready()
|
|
32
|
+
get showOverflow() {
|
|
33
|
+
return true
|
|
34
|
+
}
|
|
38
35
|
|
|
39
|
-
|
|
40
|
-
|
|
36
|
+
get hierarchy() {
|
|
37
|
+
return {
|
|
38
|
+
...super.hierarchy,
|
|
39
|
+
components: []
|
|
41
40
|
}
|
|
42
|
-
|
|
43
|
-
const { width, height } = this.state
|
|
44
|
-
|
|
45
|
-
this.carrier = Model.compile(
|
|
46
|
-
{
|
|
47
|
-
type: 'Carrier',
|
|
48
|
-
left: 0,
|
|
49
|
-
top: 0,
|
|
50
|
-
width,
|
|
51
|
-
height,
|
|
52
|
-
showText: this.getState('showCarrierText') || false
|
|
53
|
-
},
|
|
54
|
-
this.root.app
|
|
55
|
-
) as any
|
|
56
|
-
|
|
57
|
-
this.addComponent(this.carrier!)
|
|
58
|
-
|
|
59
|
-
this.carrier!.data = this.data
|
|
60
41
|
}
|
|
61
42
|
|
|
62
43
|
dispose(): void {
|
|
63
|
-
this.
|
|
64
|
-
|
|
44
|
+
;(this.root as any)?.carrierManager?.update(this, {}, this.data)
|
|
65
45
|
super.dispose()
|
|
66
46
|
}
|
|
67
47
|
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
48
|
+
async ready() {
|
|
49
|
+
super.ready()
|
|
50
|
+
|
|
51
|
+
const { CARRIERNAME, CARRIERTYPE = '', EMPTYTYPE, CARRIERSTATUS } = this.data || {}
|
|
52
|
+
|
|
53
|
+
if(CARRIERNAME) {
|
|
54
|
+
;(this.root as any).carrierManager.update(this, {
|
|
55
|
+
CARRIERNAME,
|
|
56
|
+
CARRIERTYPE,
|
|
57
|
+
EMPTYTYPE,
|
|
58
|
+
CARRIERSTATUS
|
|
59
|
+
}, undefined)
|
|
72
60
|
}
|
|
73
61
|
}
|
|
74
62
|
|
|
75
63
|
onchangeData(after: Record<string, any>, before: Record<string, any>): void {
|
|
76
|
-
|
|
77
|
-
|
|
64
|
+
// CARRIERNAME, CARRIERTYPE = '', EMPTYTYPE, CARRIERSTATUS 이 변경되었을 때만 캐리어 관리자에게 알린다.
|
|
65
|
+
const { CARRIERNAME, CARRIERTYPE = '', EMPTYTYPE, CARRIERSTATUS } = after.data || {}
|
|
66
|
+
const { CARRIERNAME: beforeCARRIERNAME, CARRIERTYPE: beforeCARRIERTYPE = '', EMPTYTYPE: beforeEMPTYTYPE, CARRIERSTATUS: beforeCARRIERSTATUS } = before.data || {}
|
|
67
|
+
if(CARRIERNAME !== beforeCARRIERNAME ||
|
|
68
|
+
CARRIERTYPE !== beforeCARRIERTYPE ||
|
|
69
|
+
EMPTYTYPE !== beforeEMPTYTYPE ||
|
|
70
|
+
CARRIERSTATUS !== beforeCARRIERSTATUS) {
|
|
71
|
+
;(this.root as any).carrierManager.update(this, {
|
|
72
|
+
CARRIERNAME,
|
|
73
|
+
CARRIERTYPE,
|
|
74
|
+
EMPTYTYPE,
|
|
75
|
+
CARRIERSTATUS
|
|
76
|
+
}, {
|
|
77
|
+
CARRIERNAME: beforeCARRIERNAME,
|
|
78
|
+
CARRIERTYPE: beforeCARRIERTYPE,
|
|
79
|
+
EMPTYTYPE: beforeEMPTYTYPE,
|
|
80
|
+
CARRIERSTATUS: beforeCARRIERSTATUS
|
|
81
|
+
})
|
|
78
82
|
}
|
|
79
83
|
|
|
80
84
|
super.onchangeData(after, before)
|
package/src/mcs-vehicle.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { Properties } from '@hatiolab/things-scene'
|
|
2
1
|
import { LEGEND_VEHICLE, Legend } from './features/mcs-status-default'
|
|
3
2
|
import MCSCarrierHolder from './mcs-carrier-holder'
|
|
4
3
|
import Node from './node'
|
|
@@ -124,22 +123,26 @@ export default class MCSVehicle extends MCSCarrierHolder {
|
|
|
124
123
|
|
|
125
124
|
if ((this.root as any).vehicleAnimation) {
|
|
126
125
|
this.trigger('waypoint', {
|
|
127
|
-
from: beforeNode,
|
|
126
|
+
from: beforeNode || afterNode,
|
|
128
127
|
to: afterNode,
|
|
129
128
|
duration: 5000
|
|
130
129
|
})
|
|
131
|
-
} else {
|
|
132
|
-
const fromCenter = beforeNode
|
|
130
|
+
} else if (beforeNode) {
|
|
131
|
+
const fromCenter = beforeNode.center
|
|
133
132
|
const toCenter = afterNode.center
|
|
134
133
|
|
|
135
|
-
const { x: startX, y: startY } = beforeNode
|
|
134
|
+
const { x: startX, y: startY } = beforeNode.transcoordS2T(fromCenter.x, fromCenter.y)
|
|
136
135
|
const { x: endX, y: endY } = afterNode.transcoordS2T(toCenter.x, toCenter.y)
|
|
137
136
|
|
|
138
137
|
const theta = Math.atan2(endY - startY, endX - startX) + Math.PI / 2
|
|
139
138
|
|
|
140
|
-
// 위치 설정
|
|
141
139
|
this.location = { x: endX, y: endY }
|
|
142
140
|
this.setState('rotation', theta)
|
|
141
|
+
} else {
|
|
142
|
+
// beforeNode 없음: afterNode 위치로 즉시 이동
|
|
143
|
+
const toCenter = afterNode.center
|
|
144
|
+
const { x, y } = afterNode.transcoordS2T(toCenter.x, toCenter.y)
|
|
145
|
+
this.location = { x, y }
|
|
143
146
|
}
|
|
144
147
|
}
|
|
145
148
|
}
|
package/src/node.ts
CHANGED
package/src/oht.ts
CHANGED
package/src/scanner.ts
ADDED
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import { Component, ComponentNature, Triangle, sceneComponent } from '@hatiolab/things-scene'
|
|
2
|
+
import { MCSStatusMixin } from './features/mcs-status-mixin'
|
|
3
|
+
|
|
4
|
+
const NATURE: ComponentNature = {
|
|
5
|
+
mutable: true,
|
|
6
|
+
resizable: false,
|
|
7
|
+
rotatable: true,
|
|
8
|
+
properties: [
|
|
9
|
+
{
|
|
10
|
+
type: 'number',
|
|
11
|
+
label: 'round',
|
|
12
|
+
name: 'round',
|
|
13
|
+
property: { min: 0, max: 100, step: 1 }
|
|
14
|
+
}
|
|
15
|
+
]
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
@sceneComponent('Scanner')
|
|
19
|
+
export default class Scanner extends MCSStatusMixin(Triangle) {
|
|
20
|
+
static get nature() {
|
|
21
|
+
return NATURE
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
is3dish() {
|
|
25
|
+
return true
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
Component.memoize(Scanner.prototype, 'path', false)
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Component, RootContainer } from '@hatiolab/things-scene'
|
|
2
2
|
import { themesColorMap, themesColorRange, themesAnimationMap } from '@fmsim/api'
|
|
3
3
|
import { Legend } from '../features/mcs-status-default'
|
|
4
|
+
import CarrierManager from '../carrier-manager'
|
|
4
5
|
|
|
5
6
|
// RootContainer 클래스 타입 확장
|
|
6
7
|
declare module '@hatiolab/things-scene' {
|
|
@@ -26,6 +27,8 @@ declare module '@hatiolab/things-scene' {
|
|
|
26
27
|
vehicleAnimation?: boolean
|
|
27
28
|
// 캐시 관련 속성 추가
|
|
28
29
|
_animationConfigCache?: Map<string, any>
|
|
30
|
+
_carrierManager?: CarrierManager
|
|
31
|
+
carrierManager: CarrierManager
|
|
29
32
|
}
|
|
30
33
|
}
|
|
31
34
|
|
|
@@ -326,3 +329,12 @@ Object.defineProperty(RootContainer.prototype, 'vehicleAnimation', {
|
|
|
326
329
|
return !!vehicleAnimation
|
|
327
330
|
}
|
|
328
331
|
})
|
|
332
|
+
|
|
333
|
+
Object.defineProperty(RootContainer.prototype, 'carrierManager', {
|
|
334
|
+
get: function () {
|
|
335
|
+
if (!this._carrierManager) {
|
|
336
|
+
this._carrierManager = new CarrierManager(this)
|
|
337
|
+
}
|
|
338
|
+
return this._carrierManager
|
|
339
|
+
}
|
|
340
|
+
})
|
|
@@ -232,7 +232,7 @@ export default class StockerAbnormalBar extends ParentObjectMixin(RectPath(Shape
|
|
|
232
232
|
const {
|
|
233
233
|
CARRIER_NORMAL = 0,
|
|
234
234
|
CARRIER_ABNORMAL = 0
|
|
235
|
-
} = typeof this.data == 'object' ? this.data : {}
|
|
235
|
+
} = this.data && typeof this.data == 'object' ? this.data : {}
|
|
236
236
|
|
|
237
237
|
this.setState({
|
|
238
238
|
carrierNormal: Number(CARRIER_NORMAL) || 0,
|
|
@@ -11,7 +11,7 @@ import { themesColorRange } from '@fmsim/api'
|
|
|
11
11
|
import { MCSStatusMixin } from './features/mcs-status-mixin'
|
|
12
12
|
import { LEGEND_CAPACITY, Legend } from './features/mcs-status-default'
|
|
13
13
|
import { safeRound } from './utils/safe-round'
|
|
14
|
-
import {
|
|
14
|
+
import { getValueOnRanges } from './utils/get-value-on-ranges'
|
|
15
15
|
import { ParentObjectMixin, ParentObjectMixinProperties } from './features/parent-object-mixin'
|
|
16
16
|
|
|
17
17
|
const NATURE: ComponentNature = {
|
|
@@ -127,7 +127,7 @@ export default class StockerCapacityBar extends ParentObjectMixin(MCSStatusMixin
|
|
|
127
127
|
|
|
128
128
|
get statusColor() {
|
|
129
129
|
const { fullup } = this.state
|
|
130
|
-
return fullup ? 'red' :
|
|
130
|
+
return fullup ? 'red' : getValueOnRanges(this.usage, this.legend)
|
|
131
131
|
}
|
|
132
132
|
|
|
133
133
|
get text() {
|
|
@@ -304,7 +304,7 @@ export default class StockerCapacityBar extends ParentObjectMixin(MCSStatusMixin
|
|
|
304
304
|
HIGHWATERMARK = 100,
|
|
305
305
|
LOWWATERMARK = 0,
|
|
306
306
|
FULLUP = 'F'
|
|
307
|
-
} = typeof this.data == 'object' ? this.data : {}
|
|
307
|
+
} = this.data && typeof this.data == 'object' ? this.data : {}
|
|
308
308
|
|
|
309
309
|
const currentUsage = Number(CURRENTCAPACITY) || 0
|
|
310
310
|
const maxCapacity = Number(MAXCAPACITY) || 100
|
|
@@ -246,7 +246,7 @@ export default class StockerCarrierBar extends ParentObjectMixin(RectPath(Shape)
|
|
|
246
246
|
CARRIER_FULL = 0,
|
|
247
247
|
CARRIER_EMPTY = 0,
|
|
248
248
|
CARRIER_EMPTY_EMPTY = 0
|
|
249
|
-
} = typeof this.data == 'object' ? this.data : {}
|
|
249
|
+
} = this.data && typeof this.data == 'object' ? this.data : {}
|
|
250
250
|
|
|
251
251
|
this.setState({
|
|
252
252
|
carrierFull: Number(CARRIER_FULL) || 0,
|
package/src/templates/index.ts
CHANGED
|
@@ -17,6 +17,7 @@ import agvLine from './agv-line'
|
|
|
17
17
|
import ohtLine from './oht-line'
|
|
18
18
|
import conveyor from './conveyor'
|
|
19
19
|
|
|
20
|
+
import Scanner from './scanner'
|
|
20
21
|
import Node from './node'
|
|
21
22
|
import DataSubscription from './data-subscription'
|
|
22
23
|
import FloatingContainer from './floating-container'
|
|
@@ -41,6 +42,7 @@ export default [
|
|
|
41
42
|
Shelf,
|
|
42
43
|
Port,
|
|
43
44
|
|
|
45
|
+
Scanner,
|
|
44
46
|
Node,
|
|
45
47
|
FloatingContainer,
|
|
46
48
|
DataSubscription
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
const icon = new URL('../../icons/equipment.png', import.meta.url).href
|
|
2
|
+
|
|
3
|
+
export default {
|
|
4
|
+
type: 'Scanner',
|
|
5
|
+
description: 'Fixed mount barcode/QR scanner',
|
|
6
|
+
group: ['etc'],
|
|
7
|
+
icon,
|
|
8
|
+
model: {
|
|
9
|
+
type: 'Scanner',
|
|
10
|
+
x1: 100,
|
|
11
|
+
y1: 100,
|
|
12
|
+
x2: 130,
|
|
13
|
+
y2: 110,
|
|
14
|
+
x3: 100,
|
|
15
|
+
y3: 120,
|
|
16
|
+
strokeStyle: '#333',
|
|
17
|
+
fillStyle: 'red',
|
|
18
|
+
lineWidth: 1
|
|
19
|
+
}
|
|
20
|
+
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export function
|
|
1
|
+
export function getValueOnRanges(value, param): any {
|
|
2
2
|
for (let range in param) {
|
|
3
3
|
let [from, to]: (number | string)[] = range.split('~')
|
|
4
4
|
let from_defined = !!from
|
|
@@ -8,14 +8,12 @@ export function getVaueOnRanges(value, param): any {
|
|
|
8
8
|
to = parseFloat(to)
|
|
9
9
|
value = Number(value) || 0
|
|
10
10
|
|
|
11
|
-
// from이나 to 둘 중 하나만 있는 경우 먼저 계산
|
|
12
11
|
if (from_defined && !to_defined && value >= from) {
|
|
13
12
|
return param[range]
|
|
14
|
-
} else if (!from_defined && to_defined && value <
|
|
13
|
+
} else if (!from_defined && to_defined && value < to) {
|
|
15
14
|
return param[range]
|
|
16
15
|
}
|
|
17
16
|
|
|
18
|
-
// 소수점이 있으므로 from <= value < to 가 되야함
|
|
19
17
|
if (value >= from && value < to) {
|
|
20
18
|
return param[range]
|
|
21
19
|
}
|
package/src/zone-capacity-bar.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { Component, ComponentNature, POSITION, Properties, sceneComponent } from
|
|
|
2
2
|
import { themesColorRange } from '@fmsim/api'
|
|
3
3
|
import { LEGEND_CAPACITY } from './features/mcs-status-default'
|
|
4
4
|
import { safeRound } from './utils/safe-round'
|
|
5
|
-
import {
|
|
5
|
+
import { getValueOnRanges } from './utils/get-value-on-ranges'
|
|
6
6
|
import { MCSZoneMixin, MCSZoneMixinProperties } from './features/mcs-zone-mixin'
|
|
7
7
|
import { ParentObjectMixinProperties } from './features/parent-object-mixin'
|
|
8
8
|
import MCSUnit from './mcs-unit'
|
|
@@ -104,7 +104,7 @@ export default class ZoneCapacityBar extends MCSZoneMixin(MCSUnit) {
|
|
|
104
104
|
|
|
105
105
|
get statusColor() {
|
|
106
106
|
const { fullup } = this.state
|
|
107
|
-
return fullup ? 'red' :
|
|
107
|
+
return fullup ? 'red' : getValueOnRanges(this.usage, this.legend)
|
|
108
108
|
}
|
|
109
109
|
|
|
110
110
|
get text() {
|
|
@@ -282,7 +282,7 @@ export default class ZoneCapacityBar extends MCSZoneMixin(MCSUnit) {
|
|
|
282
282
|
HIGHWATERMARK = 100,
|
|
283
283
|
LOWWATERMARK = 0,
|
|
284
284
|
FULLUP = 'F'
|
|
285
|
-
} = typeof this.data == 'object' ? this.data : {}
|
|
285
|
+
} = this.data && typeof this.data == 'object' ? this.data : {}
|
|
286
286
|
|
|
287
287
|
const currentUsage = Number(CURRENTCAPACITY) || 0
|
|
288
288
|
const maxCapacity = Number(MAXCAPACITY) || 100
|
package/translations/en.json
CHANGED
|
@@ -46,5 +46,6 @@
|
|
|
46
46
|
"label.node-machine": "node machine",
|
|
47
47
|
"label.nodes": "nodes",
|
|
48
48
|
"label.vehicle-animation": "vehicle animation",
|
|
49
|
-
"label.battery-rate-legend-name": "battery rate"
|
|
49
|
+
"label.battery-rate-legend-name": "battery rate",
|
|
50
|
+
"label.conveyor-orientation": "Transfer Direction"
|
|
50
51
|
}
|
package/translations/ja.json
CHANGED
|
@@ -48,5 +48,6 @@
|
|
|
48
48
|
"label.node-machine": "node machine",
|
|
49
49
|
"label.nodes": "nodes",
|
|
50
50
|
"label.vehicle-animation": "vehicle animation",
|
|
51
|
-
"label.battery-rate-legend-name": "battery rate"
|
|
51
|
+
"label.battery-rate-legend-name": "battery rate",
|
|
52
|
+
"label.conveyor-orientation": "搬送方向"
|
|
52
53
|
}
|
package/translations/ko.json
CHANGED