feat: 完成产线与仓储系统多模块迭代升级
本次迭代覆盖MES与WMS核心业务: 1. 新增接驳台托盘传感器读取与AGV对接能力 2. 完善工单排产、备料流程与权限体系拆分 3. 优化看板接口与前端路由、样式 4. 新增操作日志、库存盘点与角色保护逻辑 5. 修复代理地址、BOM保存等已知问题
This commit is contained in:
@@ -3,16 +3,27 @@ package plc
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"sync"
|
||||
)
|
||||
|
||||
// mockClient 模拟西门子 PLC:下发成功即认为写入寄存器,完成信号由外部置位。
|
||||
type mockClient struct {
|
||||
ack bool
|
||||
ack bool
|
||||
sent string
|
||||
mu sync.RWMutex
|
||||
// dockPallet 模拟接驳台是否有托盘:默认全部无托盘;联调时可用 SetDockPallet 置位
|
||||
dockPallet map[string]bool
|
||||
}
|
||||
|
||||
func newMockClient() *mockClient {
|
||||
return &mockClient{}
|
||||
return &mockClient{dockPallet: map[string]bool{}}
|
||||
}
|
||||
|
||||
// SetDockPallet 手动设置某接驳台是否有托盘(供联调/测试用)
|
||||
func (m *mockClient) SetDockPallet(dockCode string, has bool) {
|
||||
m.mu.Lock()
|
||||
defer m.mu.Unlock()
|
||||
m.dockPallet[dockCode] = has
|
||||
}
|
||||
|
||||
func (m *mockClient) SendProcessCode(_ context.Context, combination string) ([]int, error) {
|
||||
@@ -32,4 +43,10 @@ func (m *mockClient) QueryDone(_ context.Context) (bool, error) {
|
||||
|
||||
func (m *mockClient) AckDone(_ context.Context, ok bool) {
|
||||
m.ack = ok
|
||||
}
|
||||
|
||||
func (m *mockClient) QueryDockPallet(_ context.Context, dockCode string) (bool, error) {
|
||||
m.mu.RLock()
|
||||
defer m.mu.RUnlock()
|
||||
return m.dockPallet[dockCode], nil
|
||||
}
|
||||
@@ -19,6 +19,9 @@ type Client interface {
|
||||
QueryDone(ctx context.Context) (bool, error)
|
||||
// AckDone 标记完成(mock 使用,也可由 PLC 信号轮询写入)
|
||||
AckDone(ctx context.Context, ok bool)
|
||||
// QueryDockPallet 查询某接驳台(DOCK01..21)当前是否有托盘(读 PLC 托盘传感器信号)。
|
||||
// 用于 AGV 到达目的地前确认接驳台空闲。暂未接真实 PLC 时 mock 返回 false(默认无托盘)。
|
||||
QueryDockPallet(ctx context.Context, dockCode string) (bool, error)
|
||||
}
|
||||
|
||||
// Manager 管理 PLC 客户端实例
|
||||
@@ -41,6 +44,16 @@ func (m *Manager) Get() Client { return m.client }
|
||||
|
||||
func (m *Manager) IsMock() bool { return m.mock }
|
||||
|
||||
// SetMockDockPallet 仅在 mock 模式下生效:手动置位某接驳台是否有托盘(联调用)。
|
||||
func (m *Manager) SetMockDockPallet(dockCode string, has bool) {
|
||||
if !m.mock {
|
||||
return
|
||||
}
|
||||
if mc, ok := m.client.(*mockClient); ok {
|
||||
mc.SetDockPallet(dockCode, has)
|
||||
}
|
||||
}
|
||||
|
||||
// parseCombination 解析工位组合 "1,3,5" / "10,11,12" -> [1,3,5] / [10,11,12]
|
||||
func parseCombination(s string) []int {
|
||||
var out []int
|
||||
|
||||
@@ -26,4 +26,10 @@ func (t *tcpClient) QueryDone(_ context.Context) (bool, error) {
|
||||
|
||||
func (t *tcpClient) AckDone(_ context.Context, ok bool) {
|
||||
_ = ok
|
||||
}
|
||||
|
||||
// QueryDockPallet 读接驳台托盘传感器。真实对接:按 DOCK 编码映射 PLC 寄存器(如 DB101.DBX0.0=DOCK01 托盘到位)。
|
||||
// 信号定义未确认前返回 false(默认无托盘),待现场 PLC 点位表给到后在此处补读寄存器逻辑。
|
||||
func (t *tcpClient) QueryDockPallet(_ context.Context, _ string) (bool, error) {
|
||||
return false, nil
|
||||
}
|
||||
Reference in New Issue
Block a user