From 5e2640c13aa9a0e971a8d805287150eba17570e2 Mon Sep 17 00:00:00 2001 From: SunYF <123@hard_man.com> Date: Sat, 7 Nov 2026 15:06:00 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20AGV=E7=82=B9=E4=BD=8D=E9=94=81=E4=B8=8E?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E8=BF=81=E7=A7=BB=20+=20=E5=B7=A5=E4=BD=8D?= =?UTF-8?q?=E7=BB=88=E7=AB=AF=E5=8E=BB=E7=A6=BB=E7=BA=BF=E9=98=9F=E5=88=97?= =?UTF-8?q?=20+=20WMS=E5=87=BA=E5=85=A5=E5=BA=93=E5=A2=9E=E5=BC=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 【MES】 - AGV点位/线路点位/AGV任务/工单 ent schema 重构(全量重生成 ent 代码) - 新增派车锁 agv_point_lock.go:目标点位占用即拒车,JBT21 库房接驳台卸货后保持锁定待库管手动解锁 - 新增进程内 TTL 缓存 cache.go,由 Redis 看板缓存迁移至内存(singleflight 防击穿,去除外部依赖) - AGV 三段链安全机制、车辆状态/接驳台左右互换、补料损耗闭环完善 - 来料检/工序卡/工单/质检/日排产/AGV 前端与帮助文档更新 - 新增 migrations/、sql/ 目录 【WMS】 - 出库、Excel 导出、物料、路由处理增强 - 配置与 DB 初始化调整;基础数据/成品入库/入库前端调整 【工位终端】 - 移除离线同步队列(syncer 包、sync.go、SyncQueueDialog.vue),改为实时直连上报 MES(断网即失败报错),以本人身份操作 - 本地 SQLite 仅保留操作日志 + 内置账号 + 登录态;保留空闲自动登出 【文档】 - 删除 AGV海康litev1.5.md;案例.md 更新 --- AGV海康.md | 474 ------------- bj_power_mes/ent/agvpoint.go | 72 +- bj_power_mes/ent/agvpoint/agvpoint.go | 64 ++ bj_power_mes/ent/agvpoint/where.go | 260 +++++++ bj_power_mes/ent/agvpoint_create.go | 160 +++++ bj_power_mes/ent/agvpoint_update.go | 264 ++++++++ bj_power_mes/ent/agvtask.go | 26 +- bj_power_mes/ent/agvtask/agvtask.go | 24 +- bj_power_mes/ent/agvtask/where.go | 140 ++-- bj_power_mes/ent/agvtask_create.go | 60 +- bj_power_mes/ent/agvtask_update.go | 88 +-- bj_power_mes/ent/linepoint.go | 21 +- bj_power_mes/ent/linepoint/linepoint.go | 10 + bj_power_mes/ent/linepoint/where.go | 15 + bj_power_mes/ent/linepoint_create.go | 25 + bj_power_mes/ent/linepoint_update.go | 34 + bj_power_mes/ent/migrate/schema.go | 30 +- bj_power_mes/ent/mutation.go | 640 ++++++++++++++---- bj_power_mes/ent/runtime.go | 88 ++- bj_power_mes/ent/workorder.go | 13 +- bj_power_mes/ent/workorder/where.go | 70 -- bj_power_mes/ent/workorder/workorder.go | 12 - bj_power_mes/ent/workorder_create.go | 30 - bj_power_mes/ent/workorder_update.go | 44 -- bj_power_mes/etc/bj_power_mes-api.yaml | 8 +- bj_power_mes/frontend/src/help.js | 35 +- bj_power_mes/frontend/src/pages/Agv.vue | 247 ++++++- bj_power_mes/frontend/src/pages/DailyPlan.vue | 2 +- bj_power_mes/frontend/src/pages/Inspect.vue | 2 +- .../frontend/src/pages/ProcessCard.vue | 1 - .../frontend/src/pages/ProductProcess.vue | 23 +- .../frontend/src/pages/ProductType.vue | 40 +- .../frontend/src/pages/QualityInspection.vue | 2 +- bj_power_mes/frontend/src/pages/Wip.vue | 2 +- bj_power_mes/frontend/src/pages/WorkOrder.vue | 23 +- bj_power_mes/go.mod | 17 +- bj_power_mes/go.sum | 130 +--- bj_power_mes/internal/agv/client.go | 36 +- bj_power_mes/internal/config/config.go | 11 +- bj_power_mes/internal/db/db.go | 9 +- bj_power_mes/internal/handler/line.go | 6 +- bj_power_mes/internal/handler/perm.go | 1 + .../internal/handler/processcard_workorder.go | 1 - .../internal/handler/production/agv.go | 155 ++++- .../internal/handler/production/agv_chain.go | 18 +- .../handler/production/product_import.go | 28 + .../internal/handler/productprocess_card.go | 7 +- .../internal/handler/routes_production.go | 11 +- bj_power_mes/internal/logic/agv.go | 422 ++++++++++-- bj_power_mes/internal/logic/agv_point_lock.go | 197 ++++++ .../internal/logic/agv_vehicle_state.go | 15 +- bj_power_mes/internal/logic/cache.go | 53 ++ bj_power_mes/internal/logic/call.go | 24 + bj_power_mes/internal/logic/inspection.go | 5 +- bj_power_mes/internal/logic/line.go | 81 ++- bj_power_mes/internal/logic/logic.go | 81 +-- bj_power_mes/internal/logic/plc_monitor.go | 5 +- bj_power_mes/internal/logic/processflow.go | 14 +- bj_power_mes/internal/logic/product_import.go | 242 +++++-- bj_power_mes/internal/logic/productprocess.go | 21 +- bj_power_mes/internal/logic/route.go | 32 +- bj_power_mes/internal/logic/workorder.go | 25 +- bj_power_mes/internal/logic/workpiece.go | 51 +- bj_power_mes/internal/logic/workpiece_bind.go | 4 + bj_power_mes/internal/svc/service_context.go | 38 +- bj_power_mes/internal/wmsclient/client.go | 23 + .../20261105_purge_feed_line_point.sql | 34 + bj_power_mes/public/index.html | 2 +- bj_power_mes/schema/agv_point.go | 11 + bj_power_mes/schema/agv_task.go | 6 +- bj_power_mes/schema/line_point.go | 18 +- bj_power_mes/schema/work_order.go | 7 +- .../2026-11-06_agv_point_lock_drop_hik.sql | 22 + ...26-11-06_drop_workorder_product_serial.sql | 4 + bj_power_wms/etc/aitest_wms.yaml | 4 - bj_power_wms/etc/bj_power_wms-api-verify.yaml | 3 - bj_power_wms/etc/bj_power_wms-api.yaml | 4 - bj_power_wms/etc/test-8899.yaml | 4 - bj_power_wms/frontend/src/help.js | 10 +- bj_power_wms/frontend/src/pages/BaseData.vue | 28 +- .../frontend/src/pages/FinishedInbound.vue | 10 +- bj_power_wms/frontend/src/pages/Inbound.vue | 25 +- bj_power_wms/internal/config/config.go | 7 - bj_power_wms/internal/db/db.go | 38 ++ bj_power_wms/internal/handler/delivery.go | 19 + bj_power_wms/internal/handler/excel.go | 298 ++++---- bj_power_wms/internal/handler/material.go | 269 +++++--- bj_power_wms/internal/handler/routes.go | 3 + bj_power_wms/internal/svc/service_context.go | 16 +- bj_power_wms/web/static/index.html | 2 +- .../frontend/src/api/index.js | 16 +- bj_power_workstation/frontend/src/help.js | 17 +- .../frontend/src/store/station.js | 43 +- .../frontend/src/utils/request.js | 2 + .../frontend/src/views/Login.vue | 24 +- .../frontend/src/views/Main.vue | 29 +- .../src/views/panels/OfflinePanel.vue | 2 +- .../frontend/src/views/panels/OnlinePanel.vue | 50 +- .../src/views/panels/SyncQueueDialog.vue | 236 ------- .../frontend/src/views/panels/WorkPanel.vue | 8 +- .../internal/config/config.go | 7 - bj_power_workstation/internal/handler/auth.go | 15 +- .../internal/handler/report.go | 70 +- .../internal/handler/routes.go | 4 - bj_power_workstation/internal/handler/sync.go | 101 --- .../internal/handler/tightening.go | 93 ++- .../internal/handler/workpiece.go | 56 +- bj_power_workstation/internal/mes/client.go | 9 +- bj_power_workstation/internal/store/store.go | 454 +------------ .../internal/store/store_migrate_test.go | 73 -- .../internal/svc/service_context.go | 4 +- .../internal/syncer/identity_boundary_test.go | 264 -------- .../internal/syncer/syncer.go | 265 -------- .../internal/syncer/syncer_verify_test.go | 83 --- bj_power_workstation/main.go | 11 +- .../20261105_drop_offline_queue.sql | 25 + bj_power_workstation/web/static/index.html | 2 +- 案例.md | 15 +- 118 files changed, 4040 insertions(+), 3594 deletions(-) delete mode 100644 AGV海康.md create mode 100644 bj_power_mes/internal/logic/agv_point_lock.go create mode 100644 bj_power_mes/internal/logic/cache.go create mode 100644 bj_power_mes/migrations/20261105_purge_feed_line_point.sql create mode 100644 bj_power_mes/sql/pending/2026-11-06_agv_point_lock_drop_hik.sql create mode 100644 bj_power_mes/sql/pending/2026-11-06_drop_workorder_product_serial.sql delete mode 100644 bj_power_workstation/frontend/src/views/panels/SyncQueueDialog.vue delete mode 100644 bj_power_workstation/internal/handler/sync.go delete mode 100644 bj_power_workstation/internal/store/store_migrate_test.go delete mode 100644 bj_power_workstation/internal/syncer/identity_boundary_test.go delete mode 100644 bj_power_workstation/internal/syncer/syncer.go delete mode 100644 bj_power_workstation/internal/syncer/syncer_verify_test.go create mode 100644 bj_power_workstation/migrations/20261105_drop_offline_queue.sql diff --git a/AGV海康.md b/AGV海康.md deleted file mode 100644 index 6f9d1f7..0000000 --- a/AGV海康.md +++ /dev/null @@ -1,474 +0,0 @@ -# 海康机器人 RCS‑2000 V4.2 接口协议(对外发布) ->文档类别:厂内物流机器人控制系统 ->文档编号:RCS‑2000 V4.2 ->版权所有 ©杭州海康机器人股份有限公司 - -## 版权声明 -本文档由海康机器人公司开发,其版权受中华人民共和国版权法保护。海康机器人拥有本文的全部版权,未经本公司许可,任何单位及个人不得对本文中的任何部分进行转印、影印或复印。 - -## 信息反馈 -海康机器人尽最大的努力保证本手册的准确性和完整性。如果您在使用中发现问题,希望及时将情况反馈给我们以完善产品,我们将非常感谢您的支持。 - -### 总公司联系方式 -- 公司总机:0571‑88967998 -- 技术支持电话:0571‑86611880(工作日9:30‑17:30) -- 传真:0571‑88805843 -- 地址:中国杭州市滨江区东流路700号 -- 邮编:310052 -- 公司E‑mail:hikrobot@hikrobotics.com -- 公司网站:www.hikrobotics.com - -## 目录 -1. [协议概述](#1‑协议概述) - - 1.1 请求首部字段 - - 1.2 请求报文消息体 - - 1.3 加密签名 - - 1.4 响应首部字段 - - 1.5 响应报文消息体 - - 1.6 响应状态码 - - 1.7 响应报文消息体通用code -2. [业务接口说明](#2‑业务接口说明) - - 2.1 机器人调度API 接口说明 - - 2.2 反馈接收SPI 接口说明 -3. [任务下发接口调用示例](#3‑任务下发接口调用示例) -4. [典型调度场景](#4‑典型调度场景) -5. [更新说明](#5‑更新说明) - ---- - -# 1 协议概述 ->海康调度系统调用上层系统的接口,获取连接超时时间默认为30 秒,数据返回超时时间默认为60 秒,超时情况下,调度系统会返回连接失败。 - -## 1.1 请求首部字段 -|字段名|数据类型|最大字节数|是否必需|说明| -|---|---|---|---|---| -|Authorization|字符串|N/A|否|固定格式:`nonce="wab1tkh",method="HMAC‑SHA256",timestamp="2021‑01‑01T00:00:00+08:00"`| -|Content‑Type|字符串|N/A|否|固定取值:`application/json;charset=UTF‑8`| -|X‑lr‑appkey|字符串|32|否|由调度系统颁发给业务系统的唯一标识| -|X‑lr‑request‑id|字符串|16|是|业务请求的唯一标识| -|X‑lr‑version|字符串|12|否|API 接口版本,为了保证接口的向下兼容,同样的 API 接口可能存在多个版本实现| -|X‑lr‑trace‑id|字符串|32|否|全链路追踪标识,用于协查上下游故障,需要在响应中原样返回。建议使用 UUID| -|X‑lr‑source|字符串|32|否|指令的来源,便于调试和故障定位| - -## 1.2 请求报文消息体 -只能使用**JSON格式(UTF‑8编码方式)**或空字符串(无字符)。不能使用JSON对象数组或其他格式。业务请求的参数信息应当放在请求报文消息体当中。 - -**请求报文样例** -```http -POST /api/robot/controller/tasks HTTP/1.1 -Host: 10.10.10.10:1010 -Authorization: nonce="wab1tkh",method="HMAC‑SHA256",timestamp="2021‑01‑01T00:00:00+08:00" -X‑lr‑appkey: a4f********b324 -X‑lr‑version: v1.0 -X‑lr‑trace‑id: 605****8a0b -X‑lr‑request‑id: 393****a6c1 -Content‑Type: application/json;charset=UTF‑8 -Content‑Length: 512 -Date: Fri, 26 Mar 2021 06:46:14 GMT - -{"warehouseId":"371****b108",……,"zoneCode":"c7a6****371b"} -``` - -## 1.3 加密签名 -应用注册中的第三方应用,如开启加密,请求时需带上签名。`appSecret`为应用注册中的私钥。 ->请求完整示例如上所示,其中只有请求行、特定的首部字段、空行、报文消息体参与签名,即需要从请求报文原文中去除不参与签名的首部字段,将参与签名的首部字段名按下表编号的顺序排序,同时首部字段名改为大写。 - -**参与签名的首部字段** -|编号|参与签名的首部字段|是否必填| -|---|---|---| -|1|AUTHORIZATION|是| -|2|HOST|是| -|3|X‑LR‑APPKEY|是| -|4|X‑LR‑REQUEST‑ID|是| -|5|X‑LR‑SOURCE|否| -|6|X‑LR‑TRACE‑ID|否| -|7|X‑LR‑VERSION|是| - -签名生成逻辑: -> 签名 = MD5( 加盐哈希算法(appSecret,请求报文拼接后的原串) ) -> 加盐哈希算法可选: -> 1)HMAC‑SHA256(推荐) -> 2)HMAC‑SHA512 -> 使用MD5对加盐哈希算法的散列值再次哈希,产生128(16字节)的散列值。 - ->请求的签名应当携带在**查询参数**的最后,参数名为`sign`。 - -**Authorization头部参数说明** -|参数名|数据类型|字节数|是否必须|说明| -|---|---|---|---|---| -|nonce|字符串|8|是|随机数。建议每次请求都不同,以便于更有效的抵御彩虹表攻击;也可以定时更换| -|method|字符串|N/A|是|加盐哈希算法,固定枚举值:`HMAC‑SHA256`、`HMAC‑SHA512`| -|timestamp|字符串|N/A|是|请求发出的时间,遵循本文档关于时间格式秒精度的定义| - ->重放攻击验证:服务端取出timestamp,加上业务允许合法请求时间,建议不超过**120秒**,判断请求是否超时。 - -## 1.4 响应首部字段 -|字段名|数据类型|最大字节数|是否必须|说明| -|---|---|---|---|---| -|Content‑Type|字符串|N/A|否|固定取值:`application/json;charset=UTF‑8`| -|X‑lr‑request‑id|字符串|16|是|业务请求的唯一标识| -|X‑lr‑version|字符串|12|否|API接口版本| -|X‑lr‑trace‑id|字符串|32|否|全链路追踪标识,原样返回请求入参| - -## 1.5 响应报文消息体 -当HTTP 响应状态码为`200`时,响应报文消息体JSON对象格式: - -|中文名称|字段名|数据类型|最大字节数|是否必须|说明| -|---|---|---|---|---|---| -|消息码|code|字符串|32|是|参见 1.6 章节通用响应 code 定义和各接口的消息码定义| -|提示消息|message|字符串|256|否|异常描述| -|业务数据|data|JSON 对象|10MB|否|返回的业务属性对象| - -**正常响应报文样例** -```json -{ - "code":"SUCCESS", - "message":"成功", - "data": { - "robotTaskCode": "abc**13" - } -} -``` - -**业务异常响应报文样例** -```json -{ - "code":"Err_Internal", - "message":"内部未知错误", - "data":null -} -``` - -## 1.6 响应状态码 -|状态码|说明| -|---|---| -|200|HTTP协议层面处理成功,但是仍可能出现业务异常,需要根据响应报文消息体的消息码判断| -|401|签名认证失败。原因可能是签名无效、签名过期、appKey和appSecret失效,需要重新更新请求时间后加签,或需要调度系统重新颁发appKey和appSecret| -|403|权限不足。例如业务系统试图取消不由其创建的任务| -|406|请求的Content‑Type不符合要求| -|400|其他由于客户端请求错误导致的异常,无法通过重试解决,需要检查请求的格式是否符合要求| -|500|服务端的异常,可以通过重试请求解决,重试次数与间隔需要根据业务实际情况设定| - ->其余未列出状态码均按照标准HTTP协议处理即可。 - -## 1.7 响应报文消息体通用code -|Code|message| -|---|---| -|SUCCESS|成功| -|Err_Internal|内部未知错误| -|Err_DataValidationFailed|数据格式验证失败| -|Err_RequestDuplicate|请求重复| -|Err_InvalidVersion|请求版本不合法| - ---- - -# 2 业务接口说明 -服务前缀统一:`/rcs/rtas`,完整请求路径 = 服务前缀 + 路径。 - -## 2.1 机器人调度API 接口说明 -> WMS/MES作为**调用方**,主动调用RCS‑2000这一组API。 - -### 2.1.1【国标】任务组接口 -- 接口路径:`/api/robot/controller/task/group` -- 请求方式:`POST` -- 幂等性:**是** - ->接口说明 -1. 任务组是任务的集合,当任务间有相互关系时,需要先调用任务组接口,描述任务组的策略,任务间的关系组合,再调用任务下发接口。 -2. 任务策略包括按组顺序出库策略、按组分配策略。 -3. 顺序出库下发规则:上层系统将 `groupSeq` 从小到大下发给 RCS‑2000,**上层系统需要控制下发顺序**,不支持先调接口发 groupSeq 大的,再调接口发 groupSeq 小的执行顺序出库。 - -**请求体字段** -|参数名|数据类型|最大字节数|是否必须|说明| -|---|---|---|---|---| -|groupCode|字符串|32|是|任务组编号,全局唯一| -|strategy|字符串|16|是|执行策略。枚举:`GROUP_SEQ`按组顺序出库;`GROUP_ASSIGN`按组分配任务(CTU专用);`GROUP_CARRIER_ADJUST`载具整理(CTU理库)| -|strategyValue|字符串|32|否|GROUP_SEQ时必填:0组间无序组内无序;1组间及组内都有序;2组间有序组内无序;3组间无序组内有序;GROUP_CARRIER_ADJUST理库时必填| -|groupSeq|整数|8|否|组顺序(数字),从1~9999999999| -|data|JSON对象数组|N/A|是|子任务集合,每个元素:`robotTaskCode`(任务号),`sequence`(组内顺序)| - -**响应公共字段**:`code`/`message`/`data`,data内返回任务组信息。 -专用消息码:`Err_TaskNotStart`上一组任务未下发;`Err_DataValidationFailed`任务序列号有误。 - -**请求示例** -```json -{ - "groupCode": "2e0d1ae0481f48b78b6a217ac2b54eb4", - "strategy": "GROUP_SEQ", - "strategyValue": "1", - "groupSeq": 10, - "targetRoute": { - "type": "ZONE", - "code": "A2" - }, - "data": [ - {"robotTaskCode": "0a17e361eb5248bfab0508e4709f085e","sequence": 1}, - {"robotTaskCode": "1b30143f32914155ab194d55a95d54da","sequence": 2}, - {"robotTaskCode": "6541e925d1de4c448188068fcee75de5","sequence": 3} - ] -} -``` - -### 2.1.2【国标】 任务下发接口 -- 接口路径:`/api/robot/controller/task/submit` -- 请求方式:`POST` -- 幂等性:**是** - ->接口说明:业务系统发送任务请求,物流机器人调度系统生成任务执行单,并下发执行。 - -**请求体字段** -|参数名|数据类型|最大字节数|是否必须|说明| -|---|---|---|---|---| -|taskType|字符串|16|是|任务类型,预制枚举:`PF‑LMR‑COMMON`普通搬运| -|targetRoute|对象数组|N/A|是|执行步骤集合,机器人关键路径(起点、终点)| -|initPriority|整数|8|否|初始优先级1‑120,数值越大优先级越高;调度会动态修正实际优先级| -|deadline|时间|N/A|否|任务截止时间,秒精度,优先级修正条件之一| -|robotType|字符串|N/A|否|`GROUPS`资源组 / `ROBOTS`机器人编号| -|robotCode|字符串数组|N/A|否|机器人编号集合| -|robotTaskCode|字符串|64|否|外部任务唯一编号;不传则调度系统生成返回| -|extra|JSON对象|N/A|否|自定义扩展透传字段| - ->targetRoute子对象: -> - `type`:`SITE`站点;`ZONE`区域;`STORAGE`仓位;`CARRIER`载具等 -> - `code`:对应编号 -> - `operation`:`COLLECT`取货,`DELIVERY`送货,`ROTATE`旋转 -> - `carrierInfo[]`:载具信息(载具类型、编号、层号) -> - `angleInfo`:角度信息 - -**响应data字段**:`robotTaskCode`(全局唯一任务号) -专用错误码:`Err_TaskTypeNotSupport`任务类型不支持;`Err_RobotGroupsNotMatch`机器人资源组不匹配;`Err_TargetRouteError`路径参数错误。 - -### 2.1.3 任务继续执行接口 -- 路径:`/api/robot/controller/task/extend/continue` -- POST,幂等:是 - ->说明:一个任务包含多个步骤,每个步骤完成后,上层调用本接口驱动下一步骤;第一个步骤也需要调用此接口启动。若步骤设置autoStart自动开始,则可不调用;重复调用做幂等处理。 - -请求入参: -- triggerType:`SITE`站点 / `ROBOT`车号 / `TASK`任务链编号 -- triggerCode:对应编号 -- targetRoute:下一步目标路径对象 -- extra:扩展字段 - -错误码:`Err_TaskNotStart`任务尚未开始;`Err_TaskFinished`任务已结束;`Err_TaskNotFound`任务找不到。 - -### 2.1.4【国标】任务取消接口 -- 路径:`/api/robot/controller/task/cancel` -- POST,幂等:是 - ->说明:取消任务;软取消可下发回库任务;支持按任务号、机器人编号、载具编号批量取消。 - -请求体关键字段 -|参数|说明| -|---|---| -|robotTaskCode|任务号,可选| -|cancelType|`CANCEL`软取消;`DROP`人工介入硬取消| -|carrierCode|载具编号,批量取消用| -|robotCode|机器人编号,批量取消用| -|reason|取消原因| -|returnTaskType|软取消回库流程类型,默认`PF‑TASK‑CANCEL‑RETURN`| -|targetRoute|取消后机器人目标位置| - -### 2.1.5【国标】任务优先级设置接口 -- 路径:`/api/robot/controller/task/priority` -- POST,幂等:是 - ->说明:任务创建后,修改初始优先级、截止时间;调度系统会综合工况动态调整实际执行优先级。 - -入参: -- robotTaskCode:任务编号(必填) -- initPriority:1‑120 -- deadline:截止时间(可选) -- extra:扩展 - -### 2.1.6【国标】区域暂停与恢复机器人接口 -- 路径:`/api/robot/controller/zone/pause` -- POST,幂等:是 - -入参: -- zoneCode:管控区域编号 -- invoke:`FREEZE`急停暂停;`RUN`恢复运行 - -### 2.1.7【国标】区域归巢机器人接口 -- 路径:`/api/robot/controller/zone/homing` -- POST,幂等:是 - ->让指定区域机器人前往归巢点位,支持归巢后关机、定时开机。 - -入参关键字段 -- zoneCodes:区域编号集合 -- autoShutdown:`YES`关机 / `NO`不关机 -- bootTime:预设开机时间(autoShutdown=YES生效) -- expireTime:归巢超时时间 - -返回data:`homingCode`归巢指令编号;`robotCount`接收到指令的机器人数量。 - -### 2.1.8【国标】 区域驱离机器人接口 -- 路径:`/api/robot/controller/zone/banish` -- POST,幂等:是 - ->将区域内机器人驱离,禁止进入该区域。 -返回`banishCode`驱离指令编号。 - -### 2.1.9【国标】区域封锁与恢复接口 -- 路径:`/api/robot/controller/zone/blockade` -- POST,幂等:是 - ->封锁:禁止机器人进入该区域;不强制区内机器人离开。 -invoke枚举:`BLOCKADE`封锁;`OPENUP`解封。 - -### 2.1.10【国标】载具与站点绑定接口 -- 路径:`/api/robot/controller/carrier/bind` -- POST,幂等:是 - ->代表载具放置在该站点;前提:载具、站点无占用任务。 -入参:`carrierCode`载具编号,`siteCode`站点编号,`carrierDir`载具角度。 - -### 2.1.11【国标】载具与站点解绑接口 -- 路径:`/api/robot/controller/carrier/unbind` -- POST,幂等:是 - ->解绑载具‑站点;carrierCode/siteCode至少传一个。 - -### 2.1.12 存储对象与搬运对象绑定解绑接口 -- 路径:`/api/robot/controller/site/bind` -- POST,幂等:是 - ->slot:仓位/站点;invoke=`BIND`绑定 / `UNBIND`解绑;支持料箱、载具绑定解绑。 - -### 2.1.13【国标】 载具禁用与启用 -- 路径:`/api/robot/controller/carrier/lock` -- POST,幂等:是 - -invoke:`LOCK`禁用;`UNLOCK`启用;传入`carrierCode`。 - -### 2.1.14【国标】站点禁用与启用 -- 路径:`/api/robot/controller/site/lock` -- POST,幂等:是 - -invoke:`LOCK`禁用;`UNLOCK`启用;传入`siteCode`站点编号。 - -### 2.1.15 外设执行通知接口【返回0】 -- 路径:`/rcs/rtas/spi/wcs/robot/eqpt/notify` -- POST,幂等:是 - ->上层通知调度:电梯、自动门等外设动作完成。 ->旧版本返回code=0;V4.2.8使用`notifyGbt`接口返回`SUCCESS`。 - -### 2.1.16【国标】预调度任务下发接口 -- 路径:`/api/robot/controller/task/pretask` -- POST,幂等:是 - ->提前调度机器人到达点位等待业务任务。 -入参:`siteCode`站点;`nextTaskTime`预计多久后执行真实任务,单位秒。 - -### 2.1.17【国标】查询任务状态接口 -- 路径:`/api/robot/controller/task/query` -- POST,幂等:是 - ->根据`robotTaskCode`查询单条任务状态。 -返回taskStatus枚举:`QUEUE`队列中;`WAIT`等待;`EXECUTING`执行;`MANUALED`人工完成;`FINISHED`已完成;`CANCELLED`已取消。 - -### 2.1.18【国标】查询机器人状态接口 -- 路径:`/api/robot/controller/robot/query` -- POST,幂等:是 - -传入`singleRobotCode`机器人编号,返回:电量、坐标、速度、在线状态、任务状态、携带载具编号、告警信息。 - -### 2.1.19【国标】查询载具状态接口 -- 路径:`/api/robot/controller/carrier/query` -- POST,幂等:是 - -传入`carrierCode`,返回:所在站点、绑定任务号、坐标、载具状态、仓位编号、所属机器人编号。 - -### 2.1.20 物料绑定接口 -- 路径:`/api/robot/controller/matlabel/bind` -- POST,幂等:是 - ->载具绑定物料标签。入参:carrierCode,matLabel物料标签。 - -### 2.1.21 物料解绑接口 -- 路径:`/api/robot/controller/matlabel/unbind` -- POST,幂等:是 - -### 2.1.22 外设执行通知接口【V4.2.8 返回SUCCESS】 -- 路径:`/rcs/rtas/spi/wcs/robot/eqpt/notifyGbt` -- POST,幂等:是 ->新版本国标外设通知,返回code=SUCCESS,兼容电梯、自动门。 - -## 2.2 反馈接收SPI 接口说明 ->**SPI:RCS‑2000作为调用方,主动回调上层WMS/MES服务地址,推送事件、告警、状态。需要在RCS后台配置上层回调地址。** - -### 2.2.1【国标】任务执行过程回馈接口 -- 回调路径示例:`/api/robot/reporter/task` ->任务事件上报:任务开始、离开储位、任务完成等事件。 -values.method:`start`任务开始;`outbin`走出储位;`end`任务完成。 - -### 2.2.2 请求资源接口 -- 回调路径:`/api/robot/reporter/resource` ->RCS向上层申请资源:申请站点、仓位、载具。applyType:`APPLY_SITE`申请站点、`APPLY_BIN`申请仓位。上层返回目标点位信息。 - -### 2.2.3 请求外设接口 -- 回调路径:`/api/robot/reporter/eqpt` ->RCS向上层请求电梯、自动门外设资源。 - -### 2.2.4【国标】 机器人归巢完成回馈接口 -- 回调路径示例:`/api/robot/reporter/zone/homing` ->归巢全部完成/超时回调通知上层。后台需要开启业务通知开关`ZONE_HOMING`。 - -### 2.2.5【国标】区域驱离机器人完成回馈接口 -- 回调路径示例:`/api/robot/reporter/zone/banish` -驱离全部完成或超时通知;后台开启开关`ZONE_BANISH`。 - -### 2.2.6【国标】机器人异常告警上报接口 -- 回调路径示例:`/api/robot/reporter/robot/warning` ->机器人严重故障告警上报,仅推送一次;后台开启开关`AMR_ALARM`。 - -### 2.2.7【国标】任务异常告警上报接口 -- 回调路径示例:`/api/robot/reporter/task/warning` ->任务执行异常告警上报,仅推送一次;后台开启开关`TASK_ALARM`。 - -### 2.2.8 绑定解绑通知 -- 回调路径示例:`/api/robot/reporter/bind` ->载具/仓位发生绑定、解绑动作时RCS回调上层;后台开启开关`BIND`。 -invoke=`BIND`绑定 / `UNBIND`解绑。 - -# 3 任务下发接口调用示例 ->文档包含潜伏车、CTU、叉车、滚筒车等各类机器人`task/submit`完整http+json请求样例,详见原始PDF文档3章节。 - -# 4 典型调度场景 -1. 场景一:背货架AMR 在货架底下待命任务调度场景 -2. 场景二:普通背货架任务调度场景 -3. 场景三:辊筒AMR 任务调度场景 -4. 场景四:CTU 输送线预调度+入库 -5. 场景五:CTU 梳齿式工作站入库 -6. 场景六:潜伏车顺序出库场景(任务组GROUP_SEQ典型用法) -7. 场景七:潜伏车搬运与外设交互场景 - ->每个场景给出:上层系统 ↔ HIK调度系统交互步骤、对应接口编号。 - -**潜伏车顺序出库重点说明** ->方式一(推荐) ->1)先调用**任务组接口2.1.1**,定义groupCode、策略、顺序; ->2)多次调用**任务下发2.1.2**,传入groupCode下发子任务。 -> ->方式二(不推荐):任务下发接口直接携带groupCode、sequence、seqType。 - -# 5 更新说明 -|更新时间|更新人员|更新内容| -|---|---|---| -|2024/8/30|王勇52|1.编写4.2 接口文档| -|2024/9/3|王勇52|1.增加典型调度场景| -|2025/8/11|王勇52|1.修改预调度接口任务数字段描述| - ---- - ->说明:本Markdown为文档结构化转写,部分超长http请求样例做简化;实际开发请以PDF原始报文样例复制使用。 ->核心关键点总结(开发提示) ->1. API(WMS调用RCS):2.1开头;SPI回调(RCS调用WMS):2.2开头,需要RCS后台配置上层回调地址。 ->2. 全部POST,JSON;签名使用HMAC‑SHA256,签名放url query参数sign。 ->3. 任务顺序出库:优先使用任务组接口2.1.1。 ->4. 外设交互两套通知接口:旧版notify(code=0);新版notifyGbt(code=SUCCESS)V4.2.8+。 ->5. 告警、归巢、驱离、绑定解绑回调,需要在RCS后台业务通知开启对应开关,否则不会推送SPI。 - -如果你需要,我可以进一步输出一份:**WMS对接海康RCS‑2000V4.2极简对接清单(字段清单+时序)**。 \ No newline at end of file diff --git a/bj_power_mes/ent/agvpoint.go b/bj_power_mes/ent/agvpoint.go index 7e2fde5..3ac97ee 100644 --- a/bj_power_mes/ent/agvpoint.go +++ b/bj_power_mes/ent/agvpoint.go @@ -27,6 +27,18 @@ type AgvPoint struct { DockID *int `json:"dock_id,omitempty"` // 是否启用(可编辑) Enabled bool `json:"enabled,omitempty"` + // 派车锁:true=被任务占用/人工锁定,派车前查锁拒绝 + Locked bool `json:"locked,omitempty"` + // 锁来源:system=派车自动 / manual=人工 + LockedBy string `json:"locked_by,omitempty"` + // 锁定原因(system=任务号 / manual=人工原因) + LockedReason string `json:"locked_reason,omitempty"` + // 锁定时间 unix秒 + LockedAt int64 `json:"locked_at,omitempty"` + // 强提风险标记:true=该点位曾因 PLC 离线强提,派车需人工二次确认 + ForcePick bool `json:"force_pick,omitempty"` + // 强提标记时间 unix秒 + ForcePickAt int64 `json:"force_pick_at,omitempty"` // CreatedAt holds the value of the "created_at" field. CreatedAt time.Time `json:"created_at,omitempty"` selectValues sql.SelectValues @@ -37,11 +49,11 @@ func (*AgvPoint) scanValues(columns []string) ([]any, error) { values := make([]any, len(columns)) for i := range columns { switch columns[i] { - case agvpoint.FieldIsDock, agvpoint.FieldEnabled: + case agvpoint.FieldIsDock, agvpoint.FieldEnabled, agvpoint.FieldLocked, agvpoint.FieldForcePick: values[i] = new(sql.NullBool) - case agvpoint.FieldID, agvpoint.FieldDockID: + case agvpoint.FieldID, agvpoint.FieldDockID, agvpoint.FieldLockedAt, agvpoint.FieldForcePickAt: values[i] = new(sql.NullInt64) - case agvpoint.FieldPositionCode, agvpoint.FieldName: + case agvpoint.FieldPositionCode, agvpoint.FieldName, agvpoint.FieldLockedBy, agvpoint.FieldLockedReason: values[i] = new(sql.NullString) case agvpoint.FieldCreatedAt: values[i] = new(sql.NullTime) @@ -97,6 +109,42 @@ func (_m *AgvPoint) assignValues(columns []string, values []any) error { } else if value.Valid { _m.Enabled = value.Bool } + case agvpoint.FieldLocked: + if value, ok := values[i].(*sql.NullBool); !ok { + return fmt.Errorf("unexpected type %T for field locked", values[i]) + } else if value.Valid { + _m.Locked = value.Bool + } + case agvpoint.FieldLockedBy: + if value, ok := values[i].(*sql.NullString); !ok { + return fmt.Errorf("unexpected type %T for field locked_by", values[i]) + } else if value.Valid { + _m.LockedBy = value.String + } + case agvpoint.FieldLockedReason: + if value, ok := values[i].(*sql.NullString); !ok { + return fmt.Errorf("unexpected type %T for field locked_reason", values[i]) + } else if value.Valid { + _m.LockedReason = value.String + } + case agvpoint.FieldLockedAt: + if value, ok := values[i].(*sql.NullInt64); !ok { + return fmt.Errorf("unexpected type %T for field locked_at", values[i]) + } else if value.Valid { + _m.LockedAt = value.Int64 + } + case agvpoint.FieldForcePick: + if value, ok := values[i].(*sql.NullBool); !ok { + return fmt.Errorf("unexpected type %T for field force_pick", values[i]) + } else if value.Valid { + _m.ForcePick = value.Bool + } + case agvpoint.FieldForcePickAt: + if value, ok := values[i].(*sql.NullInt64); !ok { + return fmt.Errorf("unexpected type %T for field force_pick_at", values[i]) + } else if value.Valid { + _m.ForcePickAt = value.Int64 + } case agvpoint.FieldCreatedAt: if value, ok := values[i].(*sql.NullTime); !ok { return fmt.Errorf("unexpected type %T for field created_at", values[i]) @@ -156,6 +204,24 @@ func (_m *AgvPoint) String() string { builder.WriteString("enabled=") builder.WriteString(fmt.Sprintf("%v", _m.Enabled)) builder.WriteString(", ") + builder.WriteString("locked=") + builder.WriteString(fmt.Sprintf("%v", _m.Locked)) + builder.WriteString(", ") + builder.WriteString("locked_by=") + builder.WriteString(_m.LockedBy) + builder.WriteString(", ") + builder.WriteString("locked_reason=") + builder.WriteString(_m.LockedReason) + builder.WriteString(", ") + builder.WriteString("locked_at=") + builder.WriteString(fmt.Sprintf("%v", _m.LockedAt)) + builder.WriteString(", ") + builder.WriteString("force_pick=") + builder.WriteString(fmt.Sprintf("%v", _m.ForcePick)) + builder.WriteString(", ") + builder.WriteString("force_pick_at=") + builder.WriteString(fmt.Sprintf("%v", _m.ForcePickAt)) + builder.WriteString(", ") builder.WriteString("created_at=") builder.WriteString(_m.CreatedAt.Format(time.ANSIC)) builder.WriteByte(')') diff --git a/bj_power_mes/ent/agvpoint/agvpoint.go b/bj_power_mes/ent/agvpoint/agvpoint.go index 0e53dd5..a820cb8 100644 --- a/bj_power_mes/ent/agvpoint/agvpoint.go +++ b/bj_power_mes/ent/agvpoint/agvpoint.go @@ -23,6 +23,18 @@ const ( FieldDockID = "dock_id" // FieldEnabled holds the string denoting the enabled field in the database. FieldEnabled = "enabled" + // FieldLocked holds the string denoting the locked field in the database. + FieldLocked = "locked" + // FieldLockedBy holds the string denoting the locked_by field in the database. + FieldLockedBy = "locked_by" + // FieldLockedReason holds the string denoting the locked_reason field in the database. + FieldLockedReason = "locked_reason" + // FieldLockedAt holds the string denoting the locked_at field in the database. + FieldLockedAt = "locked_at" + // FieldForcePick holds the string denoting the force_pick field in the database. + FieldForcePick = "force_pick" + // FieldForcePickAt holds the string denoting the force_pick_at field in the database. + FieldForcePickAt = "force_pick_at" // FieldCreatedAt holds the string denoting the created_at field in the database. FieldCreatedAt = "created_at" // Table holds the table name of the agvpoint in the database. @@ -37,6 +49,12 @@ var Columns = []string{ FieldIsDock, FieldDockID, FieldEnabled, + FieldLocked, + FieldLockedBy, + FieldLockedReason, + FieldLockedAt, + FieldForcePick, + FieldForcePickAt, FieldCreatedAt, } @@ -61,6 +79,22 @@ var ( DefaultIsDock bool // DefaultEnabled holds the default value on creation for the "enabled" field. DefaultEnabled bool + // DefaultLocked holds the default value on creation for the "locked" field. + DefaultLocked bool + // DefaultLockedBy holds the default value on creation for the "locked_by" field. + DefaultLockedBy string + // LockedByValidator is a validator for the "locked_by" field. It is called by the builders before save. + LockedByValidator func(string) error + // DefaultLockedReason holds the default value on creation for the "locked_reason" field. + DefaultLockedReason string + // LockedReasonValidator is a validator for the "locked_reason" field. It is called by the builders before save. + LockedReasonValidator func(string) error + // DefaultLockedAt holds the default value on creation for the "locked_at" field. + DefaultLockedAt int64 + // DefaultForcePick holds the default value on creation for the "force_pick" field. + DefaultForcePick bool + // DefaultForcePickAt holds the default value on creation for the "force_pick_at" field. + DefaultForcePickAt int64 // DefaultCreatedAt holds the default value on creation for the "created_at" field. DefaultCreatedAt func() time.Time ) @@ -98,6 +132,36 @@ func ByEnabled(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldEnabled, opts...).ToFunc() } +// ByLocked orders the results by the locked field. +func ByLocked(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldLocked, opts...).ToFunc() +} + +// ByLockedBy orders the results by the locked_by field. +func ByLockedBy(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldLockedBy, opts...).ToFunc() +} + +// ByLockedReason orders the results by the locked_reason field. +func ByLockedReason(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldLockedReason, opts...).ToFunc() +} + +// ByLockedAt orders the results by the locked_at field. +func ByLockedAt(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldLockedAt, opts...).ToFunc() +} + +// ByForcePick orders the results by the force_pick field. +func ByForcePick(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldForcePick, opts...).ToFunc() +} + +// ByForcePickAt orders the results by the force_pick_at field. +func ByForcePickAt(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldForcePickAt, opts...).ToFunc() +} + // ByCreatedAt orders the results by the created_at field. func ByCreatedAt(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldCreatedAt, opts...).ToFunc() diff --git a/bj_power_mes/ent/agvpoint/where.go b/bj_power_mes/ent/agvpoint/where.go index bdd2069..9952feb 100644 --- a/bj_power_mes/ent/agvpoint/where.go +++ b/bj_power_mes/ent/agvpoint/where.go @@ -79,6 +79,36 @@ func Enabled(v bool) predicate.AgvPoint { return predicate.AgvPoint(sql.FieldEQ(FieldEnabled, v)) } +// Locked applies equality check predicate on the "locked" field. It's identical to LockedEQ. +func Locked(v bool) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldEQ(FieldLocked, v)) +} + +// LockedBy applies equality check predicate on the "locked_by" field. It's identical to LockedByEQ. +func LockedBy(v string) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldEQ(FieldLockedBy, v)) +} + +// LockedReason applies equality check predicate on the "locked_reason" field. It's identical to LockedReasonEQ. +func LockedReason(v string) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldEQ(FieldLockedReason, v)) +} + +// LockedAt applies equality check predicate on the "locked_at" field. It's identical to LockedAtEQ. +func LockedAt(v int64) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldEQ(FieldLockedAt, v)) +} + +// ForcePick applies equality check predicate on the "force_pick" field. It's identical to ForcePickEQ. +func ForcePick(v bool) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldEQ(FieldForcePick, v)) +} + +// ForcePickAt applies equality check predicate on the "force_pick_at" field. It's identical to ForcePickAtEQ. +func ForcePickAt(v int64) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldEQ(FieldForcePickAt, v)) +} + // CreatedAt applies equality check predicate on the "created_at" field. It's identical to CreatedAtEQ. func CreatedAt(v time.Time) predicate.AgvPoint { return predicate.AgvPoint(sql.FieldEQ(FieldCreatedAt, v)) @@ -284,6 +314,236 @@ func EnabledNEQ(v bool) predicate.AgvPoint { return predicate.AgvPoint(sql.FieldNEQ(FieldEnabled, v)) } +// LockedEQ applies the EQ predicate on the "locked" field. +func LockedEQ(v bool) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldEQ(FieldLocked, v)) +} + +// LockedNEQ applies the NEQ predicate on the "locked" field. +func LockedNEQ(v bool) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldNEQ(FieldLocked, v)) +} + +// LockedByEQ applies the EQ predicate on the "locked_by" field. +func LockedByEQ(v string) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldEQ(FieldLockedBy, v)) +} + +// LockedByNEQ applies the NEQ predicate on the "locked_by" field. +func LockedByNEQ(v string) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldNEQ(FieldLockedBy, v)) +} + +// LockedByIn applies the In predicate on the "locked_by" field. +func LockedByIn(vs ...string) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldIn(FieldLockedBy, vs...)) +} + +// LockedByNotIn applies the NotIn predicate on the "locked_by" field. +func LockedByNotIn(vs ...string) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldNotIn(FieldLockedBy, vs...)) +} + +// LockedByGT applies the GT predicate on the "locked_by" field. +func LockedByGT(v string) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldGT(FieldLockedBy, v)) +} + +// LockedByGTE applies the GTE predicate on the "locked_by" field. +func LockedByGTE(v string) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldGTE(FieldLockedBy, v)) +} + +// LockedByLT applies the LT predicate on the "locked_by" field. +func LockedByLT(v string) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldLT(FieldLockedBy, v)) +} + +// LockedByLTE applies the LTE predicate on the "locked_by" field. +func LockedByLTE(v string) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldLTE(FieldLockedBy, v)) +} + +// LockedByContains applies the Contains predicate on the "locked_by" field. +func LockedByContains(v string) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldContains(FieldLockedBy, v)) +} + +// LockedByHasPrefix applies the HasPrefix predicate on the "locked_by" field. +func LockedByHasPrefix(v string) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldHasPrefix(FieldLockedBy, v)) +} + +// LockedByHasSuffix applies the HasSuffix predicate on the "locked_by" field. +func LockedByHasSuffix(v string) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldHasSuffix(FieldLockedBy, v)) +} + +// LockedByEqualFold applies the EqualFold predicate on the "locked_by" field. +func LockedByEqualFold(v string) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldEqualFold(FieldLockedBy, v)) +} + +// LockedByContainsFold applies the ContainsFold predicate on the "locked_by" field. +func LockedByContainsFold(v string) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldContainsFold(FieldLockedBy, v)) +} + +// LockedReasonEQ applies the EQ predicate on the "locked_reason" field. +func LockedReasonEQ(v string) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldEQ(FieldLockedReason, v)) +} + +// LockedReasonNEQ applies the NEQ predicate on the "locked_reason" field. +func LockedReasonNEQ(v string) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldNEQ(FieldLockedReason, v)) +} + +// LockedReasonIn applies the In predicate on the "locked_reason" field. +func LockedReasonIn(vs ...string) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldIn(FieldLockedReason, vs...)) +} + +// LockedReasonNotIn applies the NotIn predicate on the "locked_reason" field. +func LockedReasonNotIn(vs ...string) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldNotIn(FieldLockedReason, vs...)) +} + +// LockedReasonGT applies the GT predicate on the "locked_reason" field. +func LockedReasonGT(v string) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldGT(FieldLockedReason, v)) +} + +// LockedReasonGTE applies the GTE predicate on the "locked_reason" field. +func LockedReasonGTE(v string) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldGTE(FieldLockedReason, v)) +} + +// LockedReasonLT applies the LT predicate on the "locked_reason" field. +func LockedReasonLT(v string) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldLT(FieldLockedReason, v)) +} + +// LockedReasonLTE applies the LTE predicate on the "locked_reason" field. +func LockedReasonLTE(v string) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldLTE(FieldLockedReason, v)) +} + +// LockedReasonContains applies the Contains predicate on the "locked_reason" field. +func LockedReasonContains(v string) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldContains(FieldLockedReason, v)) +} + +// LockedReasonHasPrefix applies the HasPrefix predicate on the "locked_reason" field. +func LockedReasonHasPrefix(v string) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldHasPrefix(FieldLockedReason, v)) +} + +// LockedReasonHasSuffix applies the HasSuffix predicate on the "locked_reason" field. +func LockedReasonHasSuffix(v string) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldHasSuffix(FieldLockedReason, v)) +} + +// LockedReasonEqualFold applies the EqualFold predicate on the "locked_reason" field. +func LockedReasonEqualFold(v string) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldEqualFold(FieldLockedReason, v)) +} + +// LockedReasonContainsFold applies the ContainsFold predicate on the "locked_reason" field. +func LockedReasonContainsFold(v string) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldContainsFold(FieldLockedReason, v)) +} + +// LockedAtEQ applies the EQ predicate on the "locked_at" field. +func LockedAtEQ(v int64) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldEQ(FieldLockedAt, v)) +} + +// LockedAtNEQ applies the NEQ predicate on the "locked_at" field. +func LockedAtNEQ(v int64) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldNEQ(FieldLockedAt, v)) +} + +// LockedAtIn applies the In predicate on the "locked_at" field. +func LockedAtIn(vs ...int64) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldIn(FieldLockedAt, vs...)) +} + +// LockedAtNotIn applies the NotIn predicate on the "locked_at" field. +func LockedAtNotIn(vs ...int64) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldNotIn(FieldLockedAt, vs...)) +} + +// LockedAtGT applies the GT predicate on the "locked_at" field. +func LockedAtGT(v int64) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldGT(FieldLockedAt, v)) +} + +// LockedAtGTE applies the GTE predicate on the "locked_at" field. +func LockedAtGTE(v int64) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldGTE(FieldLockedAt, v)) +} + +// LockedAtLT applies the LT predicate on the "locked_at" field. +func LockedAtLT(v int64) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldLT(FieldLockedAt, v)) +} + +// LockedAtLTE applies the LTE predicate on the "locked_at" field. +func LockedAtLTE(v int64) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldLTE(FieldLockedAt, v)) +} + +// ForcePickEQ applies the EQ predicate on the "force_pick" field. +func ForcePickEQ(v bool) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldEQ(FieldForcePick, v)) +} + +// ForcePickNEQ applies the NEQ predicate on the "force_pick" field. +func ForcePickNEQ(v bool) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldNEQ(FieldForcePick, v)) +} + +// ForcePickAtEQ applies the EQ predicate on the "force_pick_at" field. +func ForcePickAtEQ(v int64) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldEQ(FieldForcePickAt, v)) +} + +// ForcePickAtNEQ applies the NEQ predicate on the "force_pick_at" field. +func ForcePickAtNEQ(v int64) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldNEQ(FieldForcePickAt, v)) +} + +// ForcePickAtIn applies the In predicate on the "force_pick_at" field. +func ForcePickAtIn(vs ...int64) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldIn(FieldForcePickAt, vs...)) +} + +// ForcePickAtNotIn applies the NotIn predicate on the "force_pick_at" field. +func ForcePickAtNotIn(vs ...int64) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldNotIn(FieldForcePickAt, vs...)) +} + +// ForcePickAtGT applies the GT predicate on the "force_pick_at" field. +func ForcePickAtGT(v int64) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldGT(FieldForcePickAt, v)) +} + +// ForcePickAtGTE applies the GTE predicate on the "force_pick_at" field. +func ForcePickAtGTE(v int64) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldGTE(FieldForcePickAt, v)) +} + +// ForcePickAtLT applies the LT predicate on the "force_pick_at" field. +func ForcePickAtLT(v int64) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldLT(FieldForcePickAt, v)) +} + +// ForcePickAtLTE applies the LTE predicate on the "force_pick_at" field. +func ForcePickAtLTE(v int64) predicate.AgvPoint { + return predicate.AgvPoint(sql.FieldLTE(FieldForcePickAt, v)) +} + // CreatedAtEQ applies the EQ predicate on the "created_at" field. func CreatedAtEQ(v time.Time) predicate.AgvPoint { return predicate.AgvPoint(sql.FieldEQ(FieldCreatedAt, v)) diff --git a/bj_power_mes/ent/agvpoint_create.go b/bj_power_mes/ent/agvpoint_create.go index a09c9cf..9739763 100644 --- a/bj_power_mes/ent/agvpoint_create.go +++ b/bj_power_mes/ent/agvpoint_create.go @@ -82,6 +82,90 @@ func (_c *AgvPointCreate) SetNillableEnabled(v *bool) *AgvPointCreate { return _c } +// SetLocked sets the "locked" field. +func (_c *AgvPointCreate) SetLocked(v bool) *AgvPointCreate { + _c.mutation.SetLocked(v) + return _c +} + +// SetNillableLocked sets the "locked" field if the given value is not nil. +func (_c *AgvPointCreate) SetNillableLocked(v *bool) *AgvPointCreate { + if v != nil { + _c.SetLocked(*v) + } + return _c +} + +// SetLockedBy sets the "locked_by" field. +func (_c *AgvPointCreate) SetLockedBy(v string) *AgvPointCreate { + _c.mutation.SetLockedBy(v) + return _c +} + +// SetNillableLockedBy sets the "locked_by" field if the given value is not nil. +func (_c *AgvPointCreate) SetNillableLockedBy(v *string) *AgvPointCreate { + if v != nil { + _c.SetLockedBy(*v) + } + return _c +} + +// SetLockedReason sets the "locked_reason" field. +func (_c *AgvPointCreate) SetLockedReason(v string) *AgvPointCreate { + _c.mutation.SetLockedReason(v) + return _c +} + +// SetNillableLockedReason sets the "locked_reason" field if the given value is not nil. +func (_c *AgvPointCreate) SetNillableLockedReason(v *string) *AgvPointCreate { + if v != nil { + _c.SetLockedReason(*v) + } + return _c +} + +// SetLockedAt sets the "locked_at" field. +func (_c *AgvPointCreate) SetLockedAt(v int64) *AgvPointCreate { + _c.mutation.SetLockedAt(v) + return _c +} + +// SetNillableLockedAt sets the "locked_at" field if the given value is not nil. +func (_c *AgvPointCreate) SetNillableLockedAt(v *int64) *AgvPointCreate { + if v != nil { + _c.SetLockedAt(*v) + } + return _c +} + +// SetForcePick sets the "force_pick" field. +func (_c *AgvPointCreate) SetForcePick(v bool) *AgvPointCreate { + _c.mutation.SetForcePick(v) + return _c +} + +// SetNillableForcePick sets the "force_pick" field if the given value is not nil. +func (_c *AgvPointCreate) SetNillableForcePick(v *bool) *AgvPointCreate { + if v != nil { + _c.SetForcePick(*v) + } + return _c +} + +// SetForcePickAt sets the "force_pick_at" field. +func (_c *AgvPointCreate) SetForcePickAt(v int64) *AgvPointCreate { + _c.mutation.SetForcePickAt(v) + return _c +} + +// SetNillableForcePickAt sets the "force_pick_at" field if the given value is not nil. +func (_c *AgvPointCreate) SetNillableForcePickAt(v *int64) *AgvPointCreate { + if v != nil { + _c.SetForcePickAt(*v) + } + return _c +} + // SetCreatedAt sets the "created_at" field. func (_c *AgvPointCreate) SetCreatedAt(v time.Time) *AgvPointCreate { _c.mutation.SetCreatedAt(v) @@ -143,6 +227,30 @@ func (_c *AgvPointCreate) defaults() { v := agvpoint.DefaultEnabled _c.mutation.SetEnabled(v) } + if _, ok := _c.mutation.Locked(); !ok { + v := agvpoint.DefaultLocked + _c.mutation.SetLocked(v) + } + if _, ok := _c.mutation.LockedBy(); !ok { + v := agvpoint.DefaultLockedBy + _c.mutation.SetLockedBy(v) + } + if _, ok := _c.mutation.LockedReason(); !ok { + v := agvpoint.DefaultLockedReason + _c.mutation.SetLockedReason(v) + } + if _, ok := _c.mutation.LockedAt(); !ok { + v := agvpoint.DefaultLockedAt + _c.mutation.SetLockedAt(v) + } + if _, ok := _c.mutation.ForcePick(); !ok { + v := agvpoint.DefaultForcePick + _c.mutation.SetForcePick(v) + } + if _, ok := _c.mutation.ForcePickAt(); !ok { + v := agvpoint.DefaultForcePickAt + _c.mutation.SetForcePickAt(v) + } if _, ok := _c.mutation.CreatedAt(); !ok { v := agvpoint.DefaultCreatedAt() _c.mutation.SetCreatedAt(v) @@ -173,6 +281,34 @@ func (_c *AgvPointCreate) check() error { if _, ok := _c.mutation.Enabled(); !ok { return &ValidationError{Name: "enabled", err: errors.New(`ent: missing required field "AgvPoint.enabled"`)} } + if _, ok := _c.mutation.Locked(); !ok { + return &ValidationError{Name: "locked", err: errors.New(`ent: missing required field "AgvPoint.locked"`)} + } + if _, ok := _c.mutation.LockedBy(); !ok { + return &ValidationError{Name: "locked_by", err: errors.New(`ent: missing required field "AgvPoint.locked_by"`)} + } + if v, ok := _c.mutation.LockedBy(); ok { + if err := agvpoint.LockedByValidator(v); err != nil { + return &ValidationError{Name: "locked_by", err: fmt.Errorf(`ent: validator failed for field "AgvPoint.locked_by": %w`, err)} + } + } + if _, ok := _c.mutation.LockedReason(); !ok { + return &ValidationError{Name: "locked_reason", err: errors.New(`ent: missing required field "AgvPoint.locked_reason"`)} + } + if v, ok := _c.mutation.LockedReason(); ok { + if err := agvpoint.LockedReasonValidator(v); err != nil { + return &ValidationError{Name: "locked_reason", err: fmt.Errorf(`ent: validator failed for field "AgvPoint.locked_reason": %w`, err)} + } + } + if _, ok := _c.mutation.LockedAt(); !ok { + return &ValidationError{Name: "locked_at", err: errors.New(`ent: missing required field "AgvPoint.locked_at"`)} + } + if _, ok := _c.mutation.ForcePick(); !ok { + return &ValidationError{Name: "force_pick", err: errors.New(`ent: missing required field "AgvPoint.force_pick"`)} + } + if _, ok := _c.mutation.ForcePickAt(); !ok { + return &ValidationError{Name: "force_pick_at", err: errors.New(`ent: missing required field "AgvPoint.force_pick_at"`)} + } if _, ok := _c.mutation.CreatedAt(); !ok { return &ValidationError{Name: "created_at", err: errors.New(`ent: missing required field "AgvPoint.created_at"`)} } @@ -222,6 +358,30 @@ func (_c *AgvPointCreate) createSpec() (*AgvPoint, *sqlgraph.CreateSpec) { _spec.SetField(agvpoint.FieldEnabled, field.TypeBool, value) _node.Enabled = value } + if value, ok := _c.mutation.Locked(); ok { + _spec.SetField(agvpoint.FieldLocked, field.TypeBool, value) + _node.Locked = value + } + if value, ok := _c.mutation.LockedBy(); ok { + _spec.SetField(agvpoint.FieldLockedBy, field.TypeString, value) + _node.LockedBy = value + } + if value, ok := _c.mutation.LockedReason(); ok { + _spec.SetField(agvpoint.FieldLockedReason, field.TypeString, value) + _node.LockedReason = value + } + if value, ok := _c.mutation.LockedAt(); ok { + _spec.SetField(agvpoint.FieldLockedAt, field.TypeInt64, value) + _node.LockedAt = value + } + if value, ok := _c.mutation.ForcePick(); ok { + _spec.SetField(agvpoint.FieldForcePick, field.TypeBool, value) + _node.ForcePick = value + } + if value, ok := _c.mutation.ForcePickAt(); ok { + _spec.SetField(agvpoint.FieldForcePickAt, field.TypeInt64, value) + _node.ForcePickAt = value + } if value, ok := _c.mutation.CreatedAt(); ok { _spec.SetField(agvpoint.FieldCreatedAt, field.TypeTime, value) _node.CreatedAt = value diff --git a/bj_power_mes/ent/agvpoint_update.go b/bj_power_mes/ent/agvpoint_update.go index 572fe8d..58f72f5 100644 --- a/bj_power_mes/ent/agvpoint_update.go +++ b/bj_power_mes/ent/agvpoint_update.go @@ -111,6 +111,104 @@ func (_u *AgvPointUpdate) SetNillableEnabled(v *bool) *AgvPointUpdate { return _u } +// SetLocked sets the "locked" field. +func (_u *AgvPointUpdate) SetLocked(v bool) *AgvPointUpdate { + _u.mutation.SetLocked(v) + return _u +} + +// SetNillableLocked sets the "locked" field if the given value is not nil. +func (_u *AgvPointUpdate) SetNillableLocked(v *bool) *AgvPointUpdate { + if v != nil { + _u.SetLocked(*v) + } + return _u +} + +// SetLockedBy sets the "locked_by" field. +func (_u *AgvPointUpdate) SetLockedBy(v string) *AgvPointUpdate { + _u.mutation.SetLockedBy(v) + return _u +} + +// SetNillableLockedBy sets the "locked_by" field if the given value is not nil. +func (_u *AgvPointUpdate) SetNillableLockedBy(v *string) *AgvPointUpdate { + if v != nil { + _u.SetLockedBy(*v) + } + return _u +} + +// SetLockedReason sets the "locked_reason" field. +func (_u *AgvPointUpdate) SetLockedReason(v string) *AgvPointUpdate { + _u.mutation.SetLockedReason(v) + return _u +} + +// SetNillableLockedReason sets the "locked_reason" field if the given value is not nil. +func (_u *AgvPointUpdate) SetNillableLockedReason(v *string) *AgvPointUpdate { + if v != nil { + _u.SetLockedReason(*v) + } + return _u +} + +// SetLockedAt sets the "locked_at" field. +func (_u *AgvPointUpdate) SetLockedAt(v int64) *AgvPointUpdate { + _u.mutation.ResetLockedAt() + _u.mutation.SetLockedAt(v) + return _u +} + +// SetNillableLockedAt sets the "locked_at" field if the given value is not nil. +func (_u *AgvPointUpdate) SetNillableLockedAt(v *int64) *AgvPointUpdate { + if v != nil { + _u.SetLockedAt(*v) + } + return _u +} + +// AddLockedAt adds value to the "locked_at" field. +func (_u *AgvPointUpdate) AddLockedAt(v int64) *AgvPointUpdate { + _u.mutation.AddLockedAt(v) + return _u +} + +// SetForcePick sets the "force_pick" field. +func (_u *AgvPointUpdate) SetForcePick(v bool) *AgvPointUpdate { + _u.mutation.SetForcePick(v) + return _u +} + +// SetNillableForcePick sets the "force_pick" field if the given value is not nil. +func (_u *AgvPointUpdate) SetNillableForcePick(v *bool) *AgvPointUpdate { + if v != nil { + _u.SetForcePick(*v) + } + return _u +} + +// SetForcePickAt sets the "force_pick_at" field. +func (_u *AgvPointUpdate) SetForcePickAt(v int64) *AgvPointUpdate { + _u.mutation.ResetForcePickAt() + _u.mutation.SetForcePickAt(v) + return _u +} + +// SetNillableForcePickAt sets the "force_pick_at" field if the given value is not nil. +func (_u *AgvPointUpdate) SetNillableForcePickAt(v *int64) *AgvPointUpdate { + if v != nil { + _u.SetForcePickAt(*v) + } + return _u +} + +// AddForcePickAt adds value to the "force_pick_at" field. +func (_u *AgvPointUpdate) AddForcePickAt(v int64) *AgvPointUpdate { + _u.mutation.AddForcePickAt(v) + return _u +} + // Mutation returns the AgvPointMutation object of the builder. func (_u *AgvPointUpdate) Mutation() *AgvPointMutation { return _u.mutation @@ -155,6 +253,16 @@ func (_u *AgvPointUpdate) check() error { return &ValidationError{Name: "name", err: fmt.Errorf(`ent: validator failed for field "AgvPoint.name": %w`, err)} } } + if v, ok := _u.mutation.LockedBy(); ok { + if err := agvpoint.LockedByValidator(v); err != nil { + return &ValidationError{Name: "locked_by", err: fmt.Errorf(`ent: validator failed for field "AgvPoint.locked_by": %w`, err)} + } + } + if v, ok := _u.mutation.LockedReason(); ok { + if err := agvpoint.LockedReasonValidator(v); err != nil { + return &ValidationError{Name: "locked_reason", err: fmt.Errorf(`ent: validator failed for field "AgvPoint.locked_reason": %w`, err)} + } + } return nil } @@ -197,6 +305,30 @@ func (_u *AgvPointUpdate) sqlSave(ctx context.Context) (_node int, err error) { if value, ok := _u.mutation.Enabled(); ok { _spec.SetField(agvpoint.FieldEnabled, field.TypeBool, value) } + if value, ok := _u.mutation.Locked(); ok { + _spec.SetField(agvpoint.FieldLocked, field.TypeBool, value) + } + if value, ok := _u.mutation.LockedBy(); ok { + _spec.SetField(agvpoint.FieldLockedBy, field.TypeString, value) + } + if value, ok := _u.mutation.LockedReason(); ok { + _spec.SetField(agvpoint.FieldLockedReason, field.TypeString, value) + } + if value, ok := _u.mutation.LockedAt(); ok { + _spec.SetField(agvpoint.FieldLockedAt, field.TypeInt64, value) + } + if value, ok := _u.mutation.AddedLockedAt(); ok { + _spec.AddField(agvpoint.FieldLockedAt, field.TypeInt64, value) + } + if value, ok := _u.mutation.ForcePick(); ok { + _spec.SetField(agvpoint.FieldForcePick, field.TypeBool, value) + } + if value, ok := _u.mutation.ForcePickAt(); ok { + _spec.SetField(agvpoint.FieldForcePickAt, field.TypeInt64, value) + } + if value, ok := _u.mutation.AddedForcePickAt(); ok { + _spec.AddField(agvpoint.FieldForcePickAt, field.TypeInt64, value) + } _spec.AddModifiers(_u.modifiers...) if _node, err = sqlgraph.UpdateNodes(ctx, _u.driver, _spec); err != nil { if _, ok := err.(*sqlgraph.NotFoundError); ok { @@ -302,6 +434,104 @@ func (_u *AgvPointUpdateOne) SetNillableEnabled(v *bool) *AgvPointUpdateOne { return _u } +// SetLocked sets the "locked" field. +func (_u *AgvPointUpdateOne) SetLocked(v bool) *AgvPointUpdateOne { + _u.mutation.SetLocked(v) + return _u +} + +// SetNillableLocked sets the "locked" field if the given value is not nil. +func (_u *AgvPointUpdateOne) SetNillableLocked(v *bool) *AgvPointUpdateOne { + if v != nil { + _u.SetLocked(*v) + } + return _u +} + +// SetLockedBy sets the "locked_by" field. +func (_u *AgvPointUpdateOne) SetLockedBy(v string) *AgvPointUpdateOne { + _u.mutation.SetLockedBy(v) + return _u +} + +// SetNillableLockedBy sets the "locked_by" field if the given value is not nil. +func (_u *AgvPointUpdateOne) SetNillableLockedBy(v *string) *AgvPointUpdateOne { + if v != nil { + _u.SetLockedBy(*v) + } + return _u +} + +// SetLockedReason sets the "locked_reason" field. +func (_u *AgvPointUpdateOne) SetLockedReason(v string) *AgvPointUpdateOne { + _u.mutation.SetLockedReason(v) + return _u +} + +// SetNillableLockedReason sets the "locked_reason" field if the given value is not nil. +func (_u *AgvPointUpdateOne) SetNillableLockedReason(v *string) *AgvPointUpdateOne { + if v != nil { + _u.SetLockedReason(*v) + } + return _u +} + +// SetLockedAt sets the "locked_at" field. +func (_u *AgvPointUpdateOne) SetLockedAt(v int64) *AgvPointUpdateOne { + _u.mutation.ResetLockedAt() + _u.mutation.SetLockedAt(v) + return _u +} + +// SetNillableLockedAt sets the "locked_at" field if the given value is not nil. +func (_u *AgvPointUpdateOne) SetNillableLockedAt(v *int64) *AgvPointUpdateOne { + if v != nil { + _u.SetLockedAt(*v) + } + return _u +} + +// AddLockedAt adds value to the "locked_at" field. +func (_u *AgvPointUpdateOne) AddLockedAt(v int64) *AgvPointUpdateOne { + _u.mutation.AddLockedAt(v) + return _u +} + +// SetForcePick sets the "force_pick" field. +func (_u *AgvPointUpdateOne) SetForcePick(v bool) *AgvPointUpdateOne { + _u.mutation.SetForcePick(v) + return _u +} + +// SetNillableForcePick sets the "force_pick" field if the given value is not nil. +func (_u *AgvPointUpdateOne) SetNillableForcePick(v *bool) *AgvPointUpdateOne { + if v != nil { + _u.SetForcePick(*v) + } + return _u +} + +// SetForcePickAt sets the "force_pick_at" field. +func (_u *AgvPointUpdateOne) SetForcePickAt(v int64) *AgvPointUpdateOne { + _u.mutation.ResetForcePickAt() + _u.mutation.SetForcePickAt(v) + return _u +} + +// SetNillableForcePickAt sets the "force_pick_at" field if the given value is not nil. +func (_u *AgvPointUpdateOne) SetNillableForcePickAt(v *int64) *AgvPointUpdateOne { + if v != nil { + _u.SetForcePickAt(*v) + } + return _u +} + +// AddForcePickAt adds value to the "force_pick_at" field. +func (_u *AgvPointUpdateOne) AddForcePickAt(v int64) *AgvPointUpdateOne { + _u.mutation.AddForcePickAt(v) + return _u +} + // Mutation returns the AgvPointMutation object of the builder. func (_u *AgvPointUpdateOne) Mutation() *AgvPointMutation { return _u.mutation @@ -359,6 +589,16 @@ func (_u *AgvPointUpdateOne) check() error { return &ValidationError{Name: "name", err: fmt.Errorf(`ent: validator failed for field "AgvPoint.name": %w`, err)} } } + if v, ok := _u.mutation.LockedBy(); ok { + if err := agvpoint.LockedByValidator(v); err != nil { + return &ValidationError{Name: "locked_by", err: fmt.Errorf(`ent: validator failed for field "AgvPoint.locked_by": %w`, err)} + } + } + if v, ok := _u.mutation.LockedReason(); ok { + if err := agvpoint.LockedReasonValidator(v); err != nil { + return &ValidationError{Name: "locked_reason", err: fmt.Errorf(`ent: validator failed for field "AgvPoint.locked_reason": %w`, err)} + } + } return nil } @@ -418,6 +658,30 @@ func (_u *AgvPointUpdateOne) sqlSave(ctx context.Context) (_node *AgvPoint, err if value, ok := _u.mutation.Enabled(); ok { _spec.SetField(agvpoint.FieldEnabled, field.TypeBool, value) } + if value, ok := _u.mutation.Locked(); ok { + _spec.SetField(agvpoint.FieldLocked, field.TypeBool, value) + } + if value, ok := _u.mutation.LockedBy(); ok { + _spec.SetField(agvpoint.FieldLockedBy, field.TypeString, value) + } + if value, ok := _u.mutation.LockedReason(); ok { + _spec.SetField(agvpoint.FieldLockedReason, field.TypeString, value) + } + if value, ok := _u.mutation.LockedAt(); ok { + _spec.SetField(agvpoint.FieldLockedAt, field.TypeInt64, value) + } + if value, ok := _u.mutation.AddedLockedAt(); ok { + _spec.AddField(agvpoint.FieldLockedAt, field.TypeInt64, value) + } + if value, ok := _u.mutation.ForcePick(); ok { + _spec.SetField(agvpoint.FieldForcePick, field.TypeBool, value) + } + if value, ok := _u.mutation.ForcePickAt(); ok { + _spec.SetField(agvpoint.FieldForcePickAt, field.TypeInt64, value) + } + if value, ok := _u.mutation.AddedForcePickAt(); ok { + _spec.AddField(agvpoint.FieldForcePickAt, field.TypeInt64, value) + } _spec.AddModifiers(_u.modifiers...) _node = &AgvPoint{config: _u.config} _spec.Assign = _node.assignValues diff --git a/bj_power_mes/ent/agvtask.go b/bj_power_mes/ent/agvtask.go index 90250ee..29d60be 100644 --- a/bj_power_mes/ent/agvtask.go +++ b/bj_power_mes/ent/agvtask.go @@ -16,10 +16,8 @@ type AgvTask struct { config `json:"-"` // ID of the ent. ID int `json:"id,omitempty"` - // 我方任务号(内部) + // 我方任务号(内部,同时作为 RCS reqCode/taskCode 追踪键) TaskNo string `json:"task_no,omitempty"` - // RCS-Lite 任务单号(即我方 task_no,下发时透传 taskCode) - HikTaskCode string `json:"hik_task_code,omitempty"` // 起点接驳台(空车段可为空=单点path由RCS派最近空闲车) SourceDock string `json:"source_dock,omitempty"` // 终点接驳台/点位 DOCK01..21 或 AGV-CHARGE01 @@ -38,6 +36,8 @@ type AgvTask struct { BizType string `json:"biz_type,omitempty"` // 业务单据号(叫料单号/托盘回收标识等) BizNo string `json:"biz_no,omitempty"` + // 动作模板类型:LIFT举升(段起点或终点为接驳台,需举升/放下交接托盘)/NONE非举升(纯停靠无交接);下派时按两端点位 is_dock 自动推导并映射 RCS taskTyp,不留给人工选 + TemplateType string `json:"template_type,omitempty"` // 任务链号(=首段taskNo,同链各段关联) ChainNo string `json:"chain_no,omitempty"` // 到位自动结束(空车回充段=true,不停留待令) @@ -66,7 +66,7 @@ func (*AgvTask) scanValues(columns []string) ([]any, error) { values[i] = new(sql.NullBool) case agvtask.FieldID, agvtask.FieldDispatchedAt, agvtask.FieldArrivedAt, agvtask.FieldCreatedAt: values[i] = new(sql.NullInt64) - case agvtask.FieldTaskNo, agvtask.FieldHikTaskCode, agvtask.FieldSourceDock, agvtask.FieldTargetDock, agvtask.FieldMaterialsJSON, agvtask.FieldRelatedRequestNo, agvtask.FieldRelatedOutboundNo, agvtask.FieldStatus, agvtask.FieldKind, agvtask.FieldBizType, agvtask.FieldBizNo, agvtask.FieldChainNo, agvtask.FieldAgvCode, agvtask.FieldOperator, agvtask.FieldRemark: + case agvtask.FieldTaskNo, agvtask.FieldSourceDock, agvtask.FieldTargetDock, agvtask.FieldMaterialsJSON, agvtask.FieldRelatedRequestNo, agvtask.FieldRelatedOutboundNo, agvtask.FieldStatus, agvtask.FieldKind, agvtask.FieldBizType, agvtask.FieldBizNo, agvtask.FieldTemplateType, agvtask.FieldChainNo, agvtask.FieldAgvCode, agvtask.FieldOperator, agvtask.FieldRemark: values[i] = new(sql.NullString) default: values[i] = new(sql.UnknownType) @@ -95,12 +95,6 @@ func (_m *AgvTask) assignValues(columns []string, values []any) error { } else if value.Valid { _m.TaskNo = value.String } - case agvtask.FieldHikTaskCode: - if value, ok := values[i].(*sql.NullString); !ok { - return fmt.Errorf("unexpected type %T for field hik_task_code", values[i]) - } else if value.Valid { - _m.HikTaskCode = value.String - } case agvtask.FieldSourceDock: if value, ok := values[i].(*sql.NullString); !ok { return fmt.Errorf("unexpected type %T for field source_dock", values[i]) @@ -155,6 +149,12 @@ func (_m *AgvTask) assignValues(columns []string, values []any) error { } else if value.Valid { _m.BizNo = value.String } + case agvtask.FieldTemplateType: + if value, ok := values[i].(*sql.NullString); !ok { + return fmt.Errorf("unexpected type %T for field template_type", values[i]) + } else if value.Valid { + _m.TemplateType = value.String + } case agvtask.FieldChainNo: if value, ok := values[i].(*sql.NullString); !ok { return fmt.Errorf("unexpected type %T for field chain_no", values[i]) @@ -242,9 +242,6 @@ func (_m *AgvTask) String() string { builder.WriteString("task_no=") builder.WriteString(_m.TaskNo) builder.WriteString(", ") - builder.WriteString("hik_task_code=") - builder.WriteString(_m.HikTaskCode) - builder.WriteString(", ") builder.WriteString("source_dock=") builder.WriteString(_m.SourceDock) builder.WriteString(", ") @@ -272,6 +269,9 @@ func (_m *AgvTask) String() string { builder.WriteString("biz_no=") builder.WriteString(_m.BizNo) builder.WriteString(", ") + builder.WriteString("template_type=") + builder.WriteString(_m.TemplateType) + builder.WriteString(", ") builder.WriteString("chain_no=") builder.WriteString(_m.ChainNo) builder.WriteString(", ") diff --git a/bj_power_mes/ent/agvtask/agvtask.go b/bj_power_mes/ent/agvtask/agvtask.go index e28e8f0..ab51106 100644 --- a/bj_power_mes/ent/agvtask/agvtask.go +++ b/bj_power_mes/ent/agvtask/agvtask.go @@ -13,8 +13,6 @@ const ( FieldID = "id" // FieldTaskNo holds the string denoting the task_no field in the database. FieldTaskNo = "task_no" - // FieldHikTaskCode holds the string denoting the hik_task_code field in the database. - FieldHikTaskCode = "hik_task_code" // FieldSourceDock holds the string denoting the source_dock field in the database. FieldSourceDock = "source_dock" // FieldTargetDock holds the string denoting the target_dock field in the database. @@ -33,6 +31,8 @@ const ( FieldBizType = "biz_type" // FieldBizNo holds the string denoting the biz_no field in the database. FieldBizNo = "biz_no" + // FieldTemplateType holds the string denoting the template_type field in the database. + FieldTemplateType = "template_type" // FieldChainNo holds the string denoting the chain_no field in the database. FieldChainNo = "chain_no" // FieldAutoEnd holds the string denoting the auto_end field in the database. @@ -57,7 +57,6 @@ const ( var Columns = []string{ FieldID, FieldTaskNo, - FieldHikTaskCode, FieldSourceDock, FieldTargetDock, FieldMaterialsJSON, @@ -67,6 +66,7 @@ var Columns = []string{ FieldKind, FieldBizType, FieldBizNo, + FieldTemplateType, FieldChainNo, FieldAutoEnd, FieldAgvCode, @@ -90,10 +90,6 @@ func ValidColumn(column string) bool { var ( // TaskNoValidator is a validator for the "task_no" field. It is called by the builders before save. TaskNoValidator func(string) error - // DefaultHikTaskCode holds the default value on creation for the "hik_task_code" field. - DefaultHikTaskCode string - // HikTaskCodeValidator is a validator for the "hik_task_code" field. It is called by the builders before save. - HikTaskCodeValidator func(string) error // DefaultSourceDock holds the default value on creation for the "source_dock" field. DefaultSourceDock string // SourceDockValidator is a validator for the "source_dock" field. It is called by the builders before save. @@ -130,6 +126,10 @@ var ( DefaultBizNo string // BizNoValidator is a validator for the "biz_no" field. It is called by the builders before save. BizNoValidator func(string) error + // DefaultTemplateType holds the default value on creation for the "template_type" field. + DefaultTemplateType string + // TemplateTypeValidator is a validator for the "template_type" field. It is called by the builders before save. + TemplateTypeValidator func(string) error // DefaultChainNo holds the default value on creation for the "chain_no" field. DefaultChainNo string // ChainNoValidator is a validator for the "chain_no" field. It is called by the builders before save. @@ -169,11 +169,6 @@ func ByTaskNo(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldTaskNo, opts...).ToFunc() } -// ByHikTaskCode orders the results by the hik_task_code field. -func ByHikTaskCode(opts ...sql.OrderTermOption) OrderOption { - return sql.OrderByField(FieldHikTaskCode, opts...).ToFunc() -} - // BySourceDock orders the results by the source_dock field. func BySourceDock(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldSourceDock, opts...).ToFunc() @@ -219,6 +214,11 @@ func ByBizNo(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldBizNo, opts...).ToFunc() } +// ByTemplateType orders the results by the template_type field. +func ByTemplateType(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldTemplateType, opts...).ToFunc() +} + // ByChainNo orders the results by the chain_no field. func ByChainNo(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldChainNo, opts...).ToFunc() diff --git a/bj_power_mes/ent/agvtask/where.go b/bj_power_mes/ent/agvtask/where.go index 28e6e7b..34ee4bb 100644 --- a/bj_power_mes/ent/agvtask/where.go +++ b/bj_power_mes/ent/agvtask/where.go @@ -58,11 +58,6 @@ func TaskNo(v string) predicate.AgvTask { return predicate.AgvTask(sql.FieldEQ(FieldTaskNo, v)) } -// HikTaskCode applies equality check predicate on the "hik_task_code" field. It's identical to HikTaskCodeEQ. -func HikTaskCode(v string) predicate.AgvTask { - return predicate.AgvTask(sql.FieldEQ(FieldHikTaskCode, v)) -} - // SourceDock applies equality check predicate on the "source_dock" field. It's identical to SourceDockEQ. func SourceDock(v string) predicate.AgvTask { return predicate.AgvTask(sql.FieldEQ(FieldSourceDock, v)) @@ -108,6 +103,11 @@ func BizNo(v string) predicate.AgvTask { return predicate.AgvTask(sql.FieldEQ(FieldBizNo, v)) } +// TemplateType applies equality check predicate on the "template_type" field. It's identical to TemplateTypeEQ. +func TemplateType(v string) predicate.AgvTask { + return predicate.AgvTask(sql.FieldEQ(FieldTemplateType, v)) +} + // ChainNo applies equality check predicate on the "chain_no" field. It's identical to ChainNoEQ. func ChainNo(v string) predicate.AgvTask { return predicate.AgvTask(sql.FieldEQ(FieldChainNo, v)) @@ -213,71 +213,6 @@ func TaskNoContainsFold(v string) predicate.AgvTask { return predicate.AgvTask(sql.FieldContainsFold(FieldTaskNo, v)) } -// HikTaskCodeEQ applies the EQ predicate on the "hik_task_code" field. -func HikTaskCodeEQ(v string) predicate.AgvTask { - return predicate.AgvTask(sql.FieldEQ(FieldHikTaskCode, v)) -} - -// HikTaskCodeNEQ applies the NEQ predicate on the "hik_task_code" field. -func HikTaskCodeNEQ(v string) predicate.AgvTask { - return predicate.AgvTask(sql.FieldNEQ(FieldHikTaskCode, v)) -} - -// HikTaskCodeIn applies the In predicate on the "hik_task_code" field. -func HikTaskCodeIn(vs ...string) predicate.AgvTask { - return predicate.AgvTask(sql.FieldIn(FieldHikTaskCode, vs...)) -} - -// HikTaskCodeNotIn applies the NotIn predicate on the "hik_task_code" field. -func HikTaskCodeNotIn(vs ...string) predicate.AgvTask { - return predicate.AgvTask(sql.FieldNotIn(FieldHikTaskCode, vs...)) -} - -// HikTaskCodeGT applies the GT predicate on the "hik_task_code" field. -func HikTaskCodeGT(v string) predicate.AgvTask { - return predicate.AgvTask(sql.FieldGT(FieldHikTaskCode, v)) -} - -// HikTaskCodeGTE applies the GTE predicate on the "hik_task_code" field. -func HikTaskCodeGTE(v string) predicate.AgvTask { - return predicate.AgvTask(sql.FieldGTE(FieldHikTaskCode, v)) -} - -// HikTaskCodeLT applies the LT predicate on the "hik_task_code" field. -func HikTaskCodeLT(v string) predicate.AgvTask { - return predicate.AgvTask(sql.FieldLT(FieldHikTaskCode, v)) -} - -// HikTaskCodeLTE applies the LTE predicate on the "hik_task_code" field. -func HikTaskCodeLTE(v string) predicate.AgvTask { - return predicate.AgvTask(sql.FieldLTE(FieldHikTaskCode, v)) -} - -// HikTaskCodeContains applies the Contains predicate on the "hik_task_code" field. -func HikTaskCodeContains(v string) predicate.AgvTask { - return predicate.AgvTask(sql.FieldContains(FieldHikTaskCode, v)) -} - -// HikTaskCodeHasPrefix applies the HasPrefix predicate on the "hik_task_code" field. -func HikTaskCodeHasPrefix(v string) predicate.AgvTask { - return predicate.AgvTask(sql.FieldHasPrefix(FieldHikTaskCode, v)) -} - -// HikTaskCodeHasSuffix applies the HasSuffix predicate on the "hik_task_code" field. -func HikTaskCodeHasSuffix(v string) predicate.AgvTask { - return predicate.AgvTask(sql.FieldHasSuffix(FieldHikTaskCode, v)) -} - -// HikTaskCodeEqualFold applies the EqualFold predicate on the "hik_task_code" field. -func HikTaskCodeEqualFold(v string) predicate.AgvTask { - return predicate.AgvTask(sql.FieldEqualFold(FieldHikTaskCode, v)) -} - -// HikTaskCodeContainsFold applies the ContainsFold predicate on the "hik_task_code" field. -func HikTaskCodeContainsFold(v string) predicate.AgvTask { - return predicate.AgvTask(sql.FieldContainsFold(FieldHikTaskCode, v)) -} - // SourceDockEQ applies the EQ predicate on the "source_dock" field. func SourceDockEQ(v string) predicate.AgvTask { return predicate.AgvTask(sql.FieldEQ(FieldSourceDock, v)) @@ -883,6 +818,71 @@ func BizNoContainsFold(v string) predicate.AgvTask { return predicate.AgvTask(sql.FieldContainsFold(FieldBizNo, v)) } +// TemplateTypeEQ applies the EQ predicate on the "template_type" field. +func TemplateTypeEQ(v string) predicate.AgvTask { + return predicate.AgvTask(sql.FieldEQ(FieldTemplateType, v)) +} + +// TemplateTypeNEQ applies the NEQ predicate on the "template_type" field. +func TemplateTypeNEQ(v string) predicate.AgvTask { + return predicate.AgvTask(sql.FieldNEQ(FieldTemplateType, v)) +} + +// TemplateTypeIn applies the In predicate on the "template_type" field. +func TemplateTypeIn(vs ...string) predicate.AgvTask { + return predicate.AgvTask(sql.FieldIn(FieldTemplateType, vs...)) +} + +// TemplateTypeNotIn applies the NotIn predicate on the "template_type" field. +func TemplateTypeNotIn(vs ...string) predicate.AgvTask { + return predicate.AgvTask(sql.FieldNotIn(FieldTemplateType, vs...)) +} + +// TemplateTypeGT applies the GT predicate on the "template_type" field. +func TemplateTypeGT(v string) predicate.AgvTask { + return predicate.AgvTask(sql.FieldGT(FieldTemplateType, v)) +} + +// TemplateTypeGTE applies the GTE predicate on the "template_type" field. +func TemplateTypeGTE(v string) predicate.AgvTask { + return predicate.AgvTask(sql.FieldGTE(FieldTemplateType, v)) +} + +// TemplateTypeLT applies the LT predicate on the "template_type" field. +func TemplateTypeLT(v string) predicate.AgvTask { + return predicate.AgvTask(sql.FieldLT(FieldTemplateType, v)) +} + +// TemplateTypeLTE applies the LTE predicate on the "template_type" field. +func TemplateTypeLTE(v string) predicate.AgvTask { + return predicate.AgvTask(sql.FieldLTE(FieldTemplateType, v)) +} + +// TemplateTypeContains applies the Contains predicate on the "template_type" field. +func TemplateTypeContains(v string) predicate.AgvTask { + return predicate.AgvTask(sql.FieldContains(FieldTemplateType, v)) +} + +// TemplateTypeHasPrefix applies the HasPrefix predicate on the "template_type" field. +func TemplateTypeHasPrefix(v string) predicate.AgvTask { + return predicate.AgvTask(sql.FieldHasPrefix(FieldTemplateType, v)) +} + +// TemplateTypeHasSuffix applies the HasSuffix predicate on the "template_type" field. +func TemplateTypeHasSuffix(v string) predicate.AgvTask { + return predicate.AgvTask(sql.FieldHasSuffix(FieldTemplateType, v)) +} + +// TemplateTypeEqualFold applies the EqualFold predicate on the "template_type" field. +func TemplateTypeEqualFold(v string) predicate.AgvTask { + return predicate.AgvTask(sql.FieldEqualFold(FieldTemplateType, v)) +} + +// TemplateTypeContainsFold applies the ContainsFold predicate on the "template_type" field. +func TemplateTypeContainsFold(v string) predicate.AgvTask { + return predicate.AgvTask(sql.FieldContainsFold(FieldTemplateType, v)) +} + // ChainNoEQ applies the EQ predicate on the "chain_no" field. func ChainNoEQ(v string) predicate.AgvTask { return predicate.AgvTask(sql.FieldEQ(FieldChainNo, v)) diff --git a/bj_power_mes/ent/agvtask_create.go b/bj_power_mes/ent/agvtask_create.go index 9605e95..c8faf0a 100644 --- a/bj_power_mes/ent/agvtask_create.go +++ b/bj_power_mes/ent/agvtask_create.go @@ -25,20 +25,6 @@ func (_c *AgvTaskCreate) SetTaskNo(v string) *AgvTaskCreate { return _c } -// SetHikTaskCode sets the "hik_task_code" field. -func (_c *AgvTaskCreate) SetHikTaskCode(v string) *AgvTaskCreate { - _c.mutation.SetHikTaskCode(v) - return _c -} - -// SetNillableHikTaskCode sets the "hik_task_code" field if the given value is not nil. -func (_c *AgvTaskCreate) SetNillableHikTaskCode(v *string) *AgvTaskCreate { - if v != nil { - _c.SetHikTaskCode(*v) - } - return _c -} - // SetSourceDock sets the "source_dock" field. func (_c *AgvTaskCreate) SetSourceDock(v string) *AgvTaskCreate { _c.mutation.SetSourceDock(v) @@ -165,6 +151,20 @@ func (_c *AgvTaskCreate) SetNillableBizNo(v *string) *AgvTaskCreate { return _c } +// SetTemplateType sets the "template_type" field. +func (_c *AgvTaskCreate) SetTemplateType(v string) *AgvTaskCreate { + _c.mutation.SetTemplateType(v) + return _c +} + +// SetNillableTemplateType sets the "template_type" field if the given value is not nil. +func (_c *AgvTaskCreate) SetNillableTemplateType(v *string) *AgvTaskCreate { + if v != nil { + _c.SetTemplateType(*v) + } + return _c +} + // SetChainNo sets the "chain_no" field. func (_c *AgvTaskCreate) SetChainNo(v string) *AgvTaskCreate { _c.mutation.SetChainNo(v) @@ -312,10 +312,6 @@ func (_c *AgvTaskCreate) ExecX(ctx context.Context) { // defaults sets the default values of the builder before save. func (_c *AgvTaskCreate) defaults() { - if _, ok := _c.mutation.HikTaskCode(); !ok { - v := agvtask.DefaultHikTaskCode - _c.mutation.SetHikTaskCode(v) - } if _, ok := _c.mutation.SourceDock(); !ok { v := agvtask.DefaultSourceDock _c.mutation.SetSourceDock(v) @@ -352,6 +348,10 @@ func (_c *AgvTaskCreate) defaults() { v := agvtask.DefaultBizNo _c.mutation.SetBizNo(v) } + if _, ok := _c.mutation.TemplateType(); !ok { + v := agvtask.DefaultTemplateType + _c.mutation.SetTemplateType(v) + } if _, ok := _c.mutation.ChainNo(); !ok { v := agvtask.DefaultChainNo _c.mutation.SetChainNo(v) @@ -396,14 +396,6 @@ func (_c *AgvTaskCreate) check() error { return &ValidationError{Name: "task_no", err: fmt.Errorf(`ent: validator failed for field "AgvTask.task_no": %w`, err)} } } - if _, ok := _c.mutation.HikTaskCode(); !ok { - return &ValidationError{Name: "hik_task_code", err: errors.New(`ent: missing required field "AgvTask.hik_task_code"`)} - } - if v, ok := _c.mutation.HikTaskCode(); ok { - if err := agvtask.HikTaskCodeValidator(v); err != nil { - return &ValidationError{Name: "hik_task_code", err: fmt.Errorf(`ent: validator failed for field "AgvTask.hik_task_code": %w`, err)} - } - } if _, ok := _c.mutation.SourceDock(); !ok { return &ValidationError{Name: "source_dock", err: errors.New(`ent: missing required field "AgvTask.source_dock"`)} } @@ -470,6 +462,14 @@ func (_c *AgvTaskCreate) check() error { return &ValidationError{Name: "biz_no", err: fmt.Errorf(`ent: validator failed for field "AgvTask.biz_no": %w`, err)} } } + if _, ok := _c.mutation.TemplateType(); !ok { + return &ValidationError{Name: "template_type", err: errors.New(`ent: missing required field "AgvTask.template_type"`)} + } + if v, ok := _c.mutation.TemplateType(); ok { + if err := agvtask.TemplateTypeValidator(v); err != nil { + return &ValidationError{Name: "template_type", err: fmt.Errorf(`ent: validator failed for field "AgvTask.template_type": %w`, err)} + } + } if _, ok := _c.mutation.ChainNo(); !ok { return &ValidationError{Name: "chain_no", err: errors.New(`ent: missing required field "AgvTask.chain_no"`)} } @@ -541,10 +541,6 @@ func (_c *AgvTaskCreate) createSpec() (*AgvTask, *sqlgraph.CreateSpec) { _spec.SetField(agvtask.FieldTaskNo, field.TypeString, value) _node.TaskNo = value } - if value, ok := _c.mutation.HikTaskCode(); ok { - _spec.SetField(agvtask.FieldHikTaskCode, field.TypeString, value) - _node.HikTaskCode = value - } if value, ok := _c.mutation.SourceDock(); ok { _spec.SetField(agvtask.FieldSourceDock, field.TypeString, value) _node.SourceDock = value @@ -581,6 +577,10 @@ func (_c *AgvTaskCreate) createSpec() (*AgvTask, *sqlgraph.CreateSpec) { _spec.SetField(agvtask.FieldBizNo, field.TypeString, value) _node.BizNo = value } + if value, ok := _c.mutation.TemplateType(); ok { + _spec.SetField(agvtask.FieldTemplateType, field.TypeString, value) + _node.TemplateType = value + } if value, ok := _c.mutation.ChainNo(); ok { _spec.SetField(agvtask.FieldChainNo, field.TypeString, value) _node.ChainNo = value diff --git a/bj_power_mes/ent/agvtask_update.go b/bj_power_mes/ent/agvtask_update.go index aa2a9d5..981197b 100644 --- a/bj_power_mes/ent/agvtask_update.go +++ b/bj_power_mes/ent/agvtask_update.go @@ -42,20 +42,6 @@ func (_u *AgvTaskUpdate) SetNillableTaskNo(v *string) *AgvTaskUpdate { return _u } -// SetHikTaskCode sets the "hik_task_code" field. -func (_u *AgvTaskUpdate) SetHikTaskCode(v string) *AgvTaskUpdate { - _u.mutation.SetHikTaskCode(v) - return _u -} - -// SetNillableHikTaskCode sets the "hik_task_code" field if the given value is not nil. -func (_u *AgvTaskUpdate) SetNillableHikTaskCode(v *string) *AgvTaskUpdate { - if v != nil { - _u.SetHikTaskCode(*v) - } - return _u -} - // SetSourceDock sets the "source_dock" field. func (_u *AgvTaskUpdate) SetSourceDock(v string) *AgvTaskUpdate { _u.mutation.SetSourceDock(v) @@ -194,6 +180,20 @@ func (_u *AgvTaskUpdate) SetNillableBizNo(v *string) *AgvTaskUpdate { return _u } +// SetTemplateType sets the "template_type" field. +func (_u *AgvTaskUpdate) SetTemplateType(v string) *AgvTaskUpdate { + _u.mutation.SetTemplateType(v) + return _u +} + +// SetNillableTemplateType sets the "template_type" field if the given value is not nil. +func (_u *AgvTaskUpdate) SetNillableTemplateType(v *string) *AgvTaskUpdate { + if v != nil { + _u.SetTemplateType(*v) + } + return _u +} + // SetChainNo sets the "chain_no" field. func (_u *AgvTaskUpdate) SetChainNo(v string) *AgvTaskUpdate { _u.mutation.SetChainNo(v) @@ -372,11 +372,6 @@ func (_u *AgvTaskUpdate) check() error { return &ValidationError{Name: "task_no", err: fmt.Errorf(`ent: validator failed for field "AgvTask.task_no": %w`, err)} } } - if v, ok := _u.mutation.HikTaskCode(); ok { - if err := agvtask.HikTaskCodeValidator(v); err != nil { - return &ValidationError{Name: "hik_task_code", err: fmt.Errorf(`ent: validator failed for field "AgvTask.hik_task_code": %w`, err)} - } - } if v, ok := _u.mutation.SourceDock(); ok { if err := agvtask.SourceDockValidator(v); err != nil { return &ValidationError{Name: "source_dock", err: fmt.Errorf(`ent: validator failed for field "AgvTask.source_dock": %w`, err)} @@ -422,6 +417,11 @@ func (_u *AgvTaskUpdate) check() error { return &ValidationError{Name: "biz_no", err: fmt.Errorf(`ent: validator failed for field "AgvTask.biz_no": %w`, err)} } } + if v, ok := _u.mutation.TemplateType(); ok { + if err := agvtask.TemplateTypeValidator(v); err != nil { + return &ValidationError{Name: "template_type", err: fmt.Errorf(`ent: validator failed for field "AgvTask.template_type": %w`, err)} + } + } if v, ok := _u.mutation.ChainNo(); ok { if err := agvtask.ChainNoValidator(v); err != nil { return &ValidationError{Name: "chain_no", err: fmt.Errorf(`ent: validator failed for field "AgvTask.chain_no": %w`, err)} @@ -466,9 +466,6 @@ func (_u *AgvTaskUpdate) sqlSave(ctx context.Context) (_node int, err error) { if value, ok := _u.mutation.TaskNo(); ok { _spec.SetField(agvtask.FieldTaskNo, field.TypeString, value) } - if value, ok := _u.mutation.HikTaskCode(); ok { - _spec.SetField(agvtask.FieldHikTaskCode, field.TypeString, value) - } if value, ok := _u.mutation.SourceDock(); ok { _spec.SetField(agvtask.FieldSourceDock, field.TypeString, value) } @@ -502,6 +499,9 @@ func (_u *AgvTaskUpdate) sqlSave(ctx context.Context) (_node int, err error) { if value, ok := _u.mutation.BizNo(); ok { _spec.SetField(agvtask.FieldBizNo, field.TypeString, value) } + if value, ok := _u.mutation.TemplateType(); ok { + _spec.SetField(agvtask.FieldTemplateType, field.TypeString, value) + } if value, ok := _u.mutation.ChainNo(); ok { _spec.SetField(agvtask.FieldChainNo, field.TypeString, value) } @@ -574,20 +574,6 @@ func (_u *AgvTaskUpdateOne) SetNillableTaskNo(v *string) *AgvTaskUpdateOne { return _u } -// SetHikTaskCode sets the "hik_task_code" field. -func (_u *AgvTaskUpdateOne) SetHikTaskCode(v string) *AgvTaskUpdateOne { - _u.mutation.SetHikTaskCode(v) - return _u -} - -// SetNillableHikTaskCode sets the "hik_task_code" field if the given value is not nil. -func (_u *AgvTaskUpdateOne) SetNillableHikTaskCode(v *string) *AgvTaskUpdateOne { - if v != nil { - _u.SetHikTaskCode(*v) - } - return _u -} - // SetSourceDock sets the "source_dock" field. func (_u *AgvTaskUpdateOne) SetSourceDock(v string) *AgvTaskUpdateOne { _u.mutation.SetSourceDock(v) @@ -726,6 +712,20 @@ func (_u *AgvTaskUpdateOne) SetNillableBizNo(v *string) *AgvTaskUpdateOne { return _u } +// SetTemplateType sets the "template_type" field. +func (_u *AgvTaskUpdateOne) SetTemplateType(v string) *AgvTaskUpdateOne { + _u.mutation.SetTemplateType(v) + return _u +} + +// SetNillableTemplateType sets the "template_type" field if the given value is not nil. +func (_u *AgvTaskUpdateOne) SetNillableTemplateType(v *string) *AgvTaskUpdateOne { + if v != nil { + _u.SetTemplateType(*v) + } + return _u +} + // SetChainNo sets the "chain_no" field. func (_u *AgvTaskUpdateOne) SetChainNo(v string) *AgvTaskUpdateOne { _u.mutation.SetChainNo(v) @@ -917,11 +917,6 @@ func (_u *AgvTaskUpdateOne) check() error { return &ValidationError{Name: "task_no", err: fmt.Errorf(`ent: validator failed for field "AgvTask.task_no": %w`, err)} } } - if v, ok := _u.mutation.HikTaskCode(); ok { - if err := agvtask.HikTaskCodeValidator(v); err != nil { - return &ValidationError{Name: "hik_task_code", err: fmt.Errorf(`ent: validator failed for field "AgvTask.hik_task_code": %w`, err)} - } - } if v, ok := _u.mutation.SourceDock(); ok { if err := agvtask.SourceDockValidator(v); err != nil { return &ValidationError{Name: "source_dock", err: fmt.Errorf(`ent: validator failed for field "AgvTask.source_dock": %w`, err)} @@ -967,6 +962,11 @@ func (_u *AgvTaskUpdateOne) check() error { return &ValidationError{Name: "biz_no", err: fmt.Errorf(`ent: validator failed for field "AgvTask.biz_no": %w`, err)} } } + if v, ok := _u.mutation.TemplateType(); ok { + if err := agvtask.TemplateTypeValidator(v); err != nil { + return &ValidationError{Name: "template_type", err: fmt.Errorf(`ent: validator failed for field "AgvTask.template_type": %w`, err)} + } + } if v, ok := _u.mutation.ChainNo(); ok { if err := agvtask.ChainNoValidator(v); err != nil { return &ValidationError{Name: "chain_no", err: fmt.Errorf(`ent: validator failed for field "AgvTask.chain_no": %w`, err)} @@ -1028,9 +1028,6 @@ func (_u *AgvTaskUpdateOne) sqlSave(ctx context.Context) (_node *AgvTask, err er if value, ok := _u.mutation.TaskNo(); ok { _spec.SetField(agvtask.FieldTaskNo, field.TypeString, value) } - if value, ok := _u.mutation.HikTaskCode(); ok { - _spec.SetField(agvtask.FieldHikTaskCode, field.TypeString, value) - } if value, ok := _u.mutation.SourceDock(); ok { _spec.SetField(agvtask.FieldSourceDock, field.TypeString, value) } @@ -1064,6 +1061,9 @@ func (_u *AgvTaskUpdateOne) sqlSave(ctx context.Context) (_node *AgvTask, err er if value, ok := _u.mutation.BizNo(); ok { _spec.SetField(agvtask.FieldBizNo, field.TypeString, value) } + if value, ok := _u.mutation.TemplateType(); ok { + _spec.SetField(agvtask.FieldTemplateType, field.TypeString, value) + } if value, ok := _u.mutation.ChainNo(); ok { _spec.SetField(agvtask.FieldChainNo, field.TypeString, value) } diff --git a/bj_power_mes/ent/linepoint.go b/bj_power_mes/ent/linepoint.go index 93475d2..a3ee331 100644 --- a/bj_power_mes/ent/linepoint.go +++ b/bj_power_mes/ent/linepoint.go @@ -17,16 +17,18 @@ type LinePoint struct { config `json:"-"` // ID of the ent. ID int `json:"id,omitempty"` - // FEED上料位/STATION工位/CACHE缓存位/DOCK接驳台/END末端 + // STATION工位/STOP主线停靠位(不缓存)/CACHE主线缓存位(可缓存)/END末端;FEED上料位已废弃删除 PointType string `json:"pointType,omitempty"` - // 点位编号:IN上料位 / 1~10工位 / C1~C8缓存位 / 1-R1接驳台 / END-U上排末端 / END-D下排末端 + // 点位编号:1~10工位 / C1~C15主线位置(C1/C4/C7/C10/C13/C15=停靠位,其余=缓存位)/ END-U上排末端 / END-D下排末端 PointNo string `json:"pointNo,omitempty"` // 点位名称 Label string `json:"label,omitempty"` - // 传送带顺序(上料位→工位→末端,用于相邻缓存位判定) + // 传送带顺序(上料位→主线C1~C15→末端,用于相邻缓存位判定) Seq int `json:"seq,omitempty"` - // 所属工位号(DOCK/CACHE 归属;0=无) + // 所属工位号(归属;0=无) StationNo int `json:"stationNo,omitempty"` + // 是否可缓存(主线位置属性:C2/C3/C5/C6/C8/C9/C11/C12/C14=true;停靠位/工位/末端=false) + Cacheable bool `json:"cacheable,omitempty"` // 当前存放工件SN(空=空闲) CurrentSn string `json:"currentSn,omitempty"` // 当前工件所属工单号 @@ -43,7 +45,7 @@ func (*LinePoint) scanValues(columns []string) ([]any, error) { values := make([]any, len(columns)) for i := range columns { switch columns[i] { - case linepoint.FieldOccupied: + case linepoint.FieldCacheable, linepoint.FieldOccupied: values[i] = new(sql.NullBool) case linepoint.FieldID, linepoint.FieldSeq, linepoint.FieldStationNo: values[i] = new(sql.NullInt64) @@ -102,6 +104,12 @@ func (_m *LinePoint) assignValues(columns []string, values []any) error { } else if value.Valid { _m.StationNo = int(value.Int64) } + case linepoint.FieldCacheable: + if value, ok := values[i].(*sql.NullBool); !ok { + return fmt.Errorf("unexpected type %T for field cacheable", values[i]) + } else if value.Valid { + _m.Cacheable = value.Bool + } case linepoint.FieldCurrentSn: if value, ok := values[i].(*sql.NullString); !ok { return fmt.Errorf("unexpected type %T for field currentSn", values[i]) @@ -177,6 +185,9 @@ func (_m *LinePoint) String() string { builder.WriteString("stationNo=") builder.WriteString(fmt.Sprintf("%v", _m.StationNo)) builder.WriteString(", ") + builder.WriteString("cacheable=") + builder.WriteString(fmt.Sprintf("%v", _m.Cacheable)) + builder.WriteString(", ") builder.WriteString("currentSn=") builder.WriteString(_m.CurrentSn) builder.WriteString(", ") diff --git a/bj_power_mes/ent/linepoint/linepoint.go b/bj_power_mes/ent/linepoint/linepoint.go index c8b5505..a8a0e1c 100644 --- a/bj_power_mes/ent/linepoint/linepoint.go +++ b/bj_power_mes/ent/linepoint/linepoint.go @@ -23,6 +23,8 @@ const ( FieldSeq = "seq" // FieldStationNo holds the string denoting the stationno field in the database. FieldStationNo = "station_no" + // FieldCacheable holds the string denoting the cacheable field in the database. + FieldCacheable = "cacheable" // FieldCurrentSn holds the string denoting the currentsn field in the database. FieldCurrentSn = "current_sn" // FieldOrderNo holds the string denoting the orderno field in the database. @@ -43,6 +45,7 @@ var Columns = []string{ FieldLabel, FieldSeq, FieldStationNo, + FieldCacheable, FieldCurrentSn, FieldOrderNo, FieldOccupied, @@ -72,6 +75,8 @@ var ( DefaultSeq int // DefaultStationNo holds the default value on creation for the "stationNo" field. DefaultStationNo int + // DefaultCacheable holds the default value on creation for the "cacheable" field. + DefaultCacheable bool // DefaultCurrentSn holds the default value on creation for the "currentSn" field. DefaultCurrentSn string // CurrentSnValidator is a validator for the "currentSn" field. It is called by the builders before save. @@ -123,6 +128,11 @@ func ByStationNo(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldStationNo, opts...).ToFunc() } +// ByCacheable orders the results by the cacheable field. +func ByCacheable(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldCacheable, opts...).ToFunc() +} + // ByCurrentSn orders the results by the currentSn field. func ByCurrentSn(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldCurrentSn, opts...).ToFunc() diff --git a/bj_power_mes/ent/linepoint/where.go b/bj_power_mes/ent/linepoint/where.go index 0f5ad03..502f049 100644 --- a/bj_power_mes/ent/linepoint/where.go +++ b/bj_power_mes/ent/linepoint/where.go @@ -74,6 +74,11 @@ func StationNo(v int) predicate.LinePoint { return predicate.LinePoint(sql.FieldEQ(FieldStationNo, v)) } +// Cacheable applies equality check predicate on the "cacheable" field. It's identical to CacheableEQ. +func Cacheable(v bool) predicate.LinePoint { + return predicate.LinePoint(sql.FieldEQ(FieldCacheable, v)) +} + // CurrentSn applies equality check predicate on the "currentSn" field. It's identical to CurrentSnEQ. func CurrentSn(v string) predicate.LinePoint { return predicate.LinePoint(sql.FieldEQ(FieldCurrentSn, v)) @@ -369,6 +374,16 @@ func StationNoLTE(v int) predicate.LinePoint { return predicate.LinePoint(sql.FieldLTE(FieldStationNo, v)) } +// CacheableEQ applies the EQ predicate on the "cacheable" field. +func CacheableEQ(v bool) predicate.LinePoint { + return predicate.LinePoint(sql.FieldEQ(FieldCacheable, v)) +} + +// CacheableNEQ applies the NEQ predicate on the "cacheable" field. +func CacheableNEQ(v bool) predicate.LinePoint { + return predicate.LinePoint(sql.FieldNEQ(FieldCacheable, v)) +} + // CurrentSnEQ applies the EQ predicate on the "currentSn" field. func CurrentSnEQ(v string) predicate.LinePoint { return predicate.LinePoint(sql.FieldEQ(FieldCurrentSn, v)) diff --git a/bj_power_mes/ent/linepoint_create.go b/bj_power_mes/ent/linepoint_create.go index 8695646..613e6ce 100644 --- a/bj_power_mes/ent/linepoint_create.go +++ b/bj_power_mes/ent/linepoint_create.go @@ -74,6 +74,20 @@ func (_c *LinePointCreate) SetNillableStationNo(v *int) *LinePointCreate { return _c } +// SetCacheable sets the "cacheable" field. +func (_c *LinePointCreate) SetCacheable(v bool) *LinePointCreate { + _c.mutation.SetCacheable(v) + return _c +} + +// SetNillableCacheable sets the "cacheable" field if the given value is not nil. +func (_c *LinePointCreate) SetNillableCacheable(v *bool) *LinePointCreate { + if v != nil { + _c.SetCacheable(*v) + } + return _c +} + // SetCurrentSn sets the "currentSn" field. func (_c *LinePointCreate) SetCurrentSn(v string) *LinePointCreate { _c.mutation.SetCurrentSn(v) @@ -183,6 +197,10 @@ func (_c *LinePointCreate) defaults() { v := linepoint.DefaultStationNo _c.mutation.SetStationNo(v) } + if _, ok := _c.mutation.Cacheable(); !ok { + v := linepoint.DefaultCacheable + _c.mutation.SetCacheable(v) + } if _, ok := _c.mutation.CurrentSn(); !ok { v := linepoint.DefaultCurrentSn _c.mutation.SetCurrentSn(v) @@ -233,6 +251,9 @@ func (_c *LinePointCreate) check() error { if _, ok := _c.mutation.StationNo(); !ok { return &ValidationError{Name: "stationNo", err: errors.New(`ent: missing required field "LinePoint.stationNo"`)} } + if _, ok := _c.mutation.Cacheable(); !ok { + return &ValidationError{Name: "cacheable", err: errors.New(`ent: missing required field "LinePoint.cacheable"`)} + } if _, ok := _c.mutation.CurrentSn(); !ok { return &ValidationError{Name: "currentSn", err: errors.New(`ent: missing required field "LinePoint.currentSn"`)} } @@ -312,6 +333,10 @@ func (_c *LinePointCreate) createSpec() (*LinePoint, *sqlgraph.CreateSpec) { _spec.SetField(linepoint.FieldStationNo, field.TypeInt, value) _node.StationNo = value } + if value, ok := _c.mutation.Cacheable(); ok { + _spec.SetField(linepoint.FieldCacheable, field.TypeBool, value) + _node.Cacheable = value + } if value, ok := _c.mutation.CurrentSn(); ok { _spec.SetField(linepoint.FieldCurrentSn, field.TypeString, value) _node.CurrentSn = value diff --git a/bj_power_mes/ent/linepoint_update.go b/bj_power_mes/ent/linepoint_update.go index 4b6c932..7395c6a 100644 --- a/bj_power_mes/ent/linepoint_update.go +++ b/bj_power_mes/ent/linepoint_update.go @@ -113,6 +113,20 @@ func (_u *LinePointUpdate) AddStationNo(v int) *LinePointUpdate { return _u } +// SetCacheable sets the "cacheable" field. +func (_u *LinePointUpdate) SetCacheable(v bool) *LinePointUpdate { + _u.mutation.SetCacheable(v) + return _u +} + +// SetNillableCacheable sets the "cacheable" field if the given value is not nil. +func (_u *LinePointUpdate) SetNillableCacheable(v *bool) *LinePointUpdate { + if v != nil { + _u.SetCacheable(*v) + } + return _u +} + // SetCurrentSn sets the "currentSn" field. func (_u *LinePointUpdate) SetCurrentSn(v string) *LinePointUpdate { _u.mutation.SetCurrentSn(v) @@ -271,6 +285,9 @@ func (_u *LinePointUpdate) sqlSave(ctx context.Context) (_node int, err error) { if value, ok := _u.mutation.AddedStationNo(); ok { _spec.AddField(linepoint.FieldStationNo, field.TypeInt, value) } + if value, ok := _u.mutation.Cacheable(); ok { + _spec.SetField(linepoint.FieldCacheable, field.TypeBool, value) + } if value, ok := _u.mutation.CurrentSn(); ok { _spec.SetField(linepoint.FieldCurrentSn, field.TypeString, value) } @@ -389,6 +406,20 @@ func (_u *LinePointUpdateOne) AddStationNo(v int) *LinePointUpdateOne { return _u } +// SetCacheable sets the "cacheable" field. +func (_u *LinePointUpdateOne) SetCacheable(v bool) *LinePointUpdateOne { + _u.mutation.SetCacheable(v) + return _u +} + +// SetNillableCacheable sets the "cacheable" field if the given value is not nil. +func (_u *LinePointUpdateOne) SetNillableCacheable(v *bool) *LinePointUpdateOne { + if v != nil { + _u.SetCacheable(*v) + } + return _u +} + // SetCurrentSn sets the "currentSn" field. func (_u *LinePointUpdateOne) SetCurrentSn(v string) *LinePointUpdateOne { _u.mutation.SetCurrentSn(v) @@ -577,6 +608,9 @@ func (_u *LinePointUpdateOne) sqlSave(ctx context.Context) (_node *LinePoint, er if value, ok := _u.mutation.AddedStationNo(); ok { _spec.AddField(linepoint.FieldStationNo, field.TypeInt, value) } + if value, ok := _u.mutation.Cacheable(); ok { + _spec.SetField(linepoint.FieldCacheable, field.TypeBool, value) + } if value, ok := _u.mutation.CurrentSn(); ok { _spec.SetField(linepoint.FieldCurrentSn, field.TypeString, value) } diff --git a/bj_power_mes/ent/migrate/schema.go b/bj_power_mes/ent/migrate/schema.go index b7552f3..e31032f 100644 --- a/bj_power_mes/ent/migrate/schema.go +++ b/bj_power_mes/ent/migrate/schema.go @@ -17,6 +17,12 @@ var ( {Name: "is_dock", Type: field.TypeBool, Comment: "是否接驳台点位(true=绑定接驳台,false=纯待命/充电点位)", Default: false}, {Name: "dock_id", Type: field.TypeInt, Nullable: true, Comment: "绑定的接驳台 ID(is_dock=true 时硬件内置强绑定)"}, {Name: "enabled", Type: field.TypeBool, Comment: "是否启用(可编辑)", Default: true}, + {Name: "locked", Type: field.TypeBool, Comment: "派车锁:true=被任务占用/人工锁定,派车前查锁拒绝", Default: false}, + {Name: "locked_by", Type: field.TypeString, Size: 10, Comment: "锁来源:system=派车自动 / manual=人工", Default: ""}, + {Name: "locked_reason", Type: field.TypeString, Size: 64, Comment: "锁定原因(system=任务号 / manual=人工原因)", Default: ""}, + {Name: "locked_at", Type: field.TypeInt64, Comment: "锁定时间 unix秒", Default: 0}, + {Name: "force_pick", Type: field.TypeBool, Comment: "强提风险标记:true=该点位曾因 PLC 离线强提,派车需人工二次确认", Default: false}, + {Name: "force_pick_at", Type: field.TypeInt64, Comment: "强提标记时间 unix秒", Default: 0}, {Name: "created_at", Type: field.TypeTime}, } // AgvPointTable holds the schema information for the "agv_point" table. @@ -46,8 +52,7 @@ var ( // AgvTasksColumns holds the columns for the "agv_tasks" table. AgvTasksColumns = []*schema.Column{ {Name: "id", Type: field.TypeInt, Increment: true}, - {Name: "task_no", Type: field.TypeString, Unique: true, Size: 64, Comment: "我方任务号(内部)"}, - {Name: "hik_task_code", Type: field.TypeString, Size: 64, Comment: "RCS-Lite 任务单号(即我方 task_no,下发时透传 taskCode)", Default: ""}, + {Name: "task_no", Type: field.TypeString, Unique: true, Size: 64, Comment: "我方任务号(内部,同时作为 RCS reqCode/taskCode 追踪键)"}, {Name: "source_dock", Type: field.TypeString, Size: 20, Comment: "起点接驳台(空车段可为空=单点path由RCS派最近空闲车)", Default: ""}, {Name: "target_dock", Type: field.TypeString, Size: 20, Comment: "终点接驳台/点位 DOCK01..21 或 AGV-CHARGE01", Default: ""}, {Name: "materials_json", Type: field.TypeString, Size: 4000, Comment: "物料清单 JSON", Default: ""}, @@ -57,6 +62,7 @@ var ( {Name: "kind", Type: field.TypeString, Size: 20, Comment: "段类型:GO_LOAD空车去装货点/TRANSPORT重载运输/EMPTY_RETURN空车回充/FREE人工自由调度单点段", Default: "TRANSPORT"}, {Name: "biz_type", Type: field.TypeString, Size: 20, Comment: "业务来源:CALL叫料/PALLET托盘回收/FREE自由调度", Default: "CALL"}, {Name: "biz_no", Type: field.TypeString, Size: 64, Comment: "业务单据号(叫料单号/托盘回收标识等)", Default: ""}, + {Name: "template_type", Type: field.TypeString, Size: 10, Comment: "动作模板类型:LIFT举升(段起点或终点为接驳台,需举升/放下交接托盘)/NONE非举升(纯停靠无交接);下派时按两端点位 is_dock 自动推导并映射 RCS taskTyp,不留给人工选", Default: "NONE"}, {Name: "chain_no", Type: field.TypeString, Size: 64, Comment: "任务链号(=首段taskNo,同链各段关联)", Default: ""}, {Name: "auto_end", Type: field.TypeBool, Comment: "到位自动结束(空车回充段=true,不停留待令)", Default: false}, {Name: "agv_code", Type: field.TypeString, Size: 32, Comment: "RCS 分配的车辆编号(任务分车后由回调/查询回写)", Default: ""}, @@ -81,17 +87,17 @@ var ( { Name: "agvtask_target_dock", Unique: false, - Columns: []*schema.Column{AgvTasksColumns[4]}, + Columns: []*schema.Column{AgvTasksColumns[3]}, }, { Name: "agvtask_status", Unique: false, - Columns: []*schema.Column{AgvTasksColumns[8]}, + Columns: []*schema.Column{AgvTasksColumns[7]}, }, { - Name: "agvtask_hik_task_code", + Name: "agvtask_chain_no", Unique: false, - Columns: []*schema.Column{AgvTasksColumns[2]}, + Columns: []*schema.Column{AgvTasksColumns[12]}, }, }, } @@ -539,11 +545,12 @@ var ( // LinePointColumns holds the columns for the "line_point" table. LinePointColumns = []*schema.Column{ {Name: "id", Type: field.TypeInt, Increment: true}, - {Name: "point_type", Type: field.TypeString, Size: 20, Comment: "FEED上料位/STATION工位/CACHE缓存位/DOCK接驳台/END末端"}, - {Name: "point_no", Type: field.TypeString, Size: 32, Comment: "点位编号:IN上料位 / 1~10工位 / C1~C8缓存位 / 1-R1接驳台 / END-U上排末端 / END-D下排末端"}, + {Name: "point_type", Type: field.TypeString, Size: 20, Comment: "STATION工位/STOP主线停靠位(不缓存)/CACHE主线缓存位(可缓存)/END末端;FEED上料位已废弃删除"}, + {Name: "point_no", Type: field.TypeString, Size: 32, Comment: "点位编号:1~10工位 / C1~C15主线位置(C1/C4/C7/C10/C13/C15=停靠位,其余=缓存位)/ END-U上排末端 / END-D下排末端"}, {Name: "label", Type: field.TypeString, Size: 64, Comment: "点位名称", Default: ""}, - {Name: "seq", Type: field.TypeInt, Comment: "传送带顺序(上料位→工位→末端,用于相邻缓存位判定)", Default: 0}, - {Name: "station_no", Type: field.TypeInt, Comment: "所属工位号(DOCK/CACHE 归属;0=无)", Default: 0}, + {Name: "seq", Type: field.TypeInt, Comment: "传送带顺序(上料位→主线C1~C15→末端,用于相邻缓存位判定)", Default: 0}, + {Name: "station_no", Type: field.TypeInt, Comment: "所属工位号(归属;0=无)", Default: 0}, + {Name: "cacheable", Type: field.TypeBool, Comment: "是否可缓存(主线位置属性:C2/C3/C5/C6/C8/C9/C11/C12/C14=true;停靠位/工位/末端=false)", Default: false}, {Name: "current_sn", Type: field.TypeString, Size: 128, Comment: "当前存放工件SN(空=空闲)", Default: ""}, {Name: "order_no", Type: field.TypeString, Size: 64, Comment: "当前工件所属工单号", Default: ""}, {Name: "occupied", Type: field.TypeBool, Comment: "是否占用", Default: false}, @@ -1362,7 +1369,6 @@ var ( {Name: "contract_no", Type: field.TypeString, Size: 64, Comment: "归属编号(合同号或科技项目号,随归属类型二选一)", Default: ""}, {Name: "ownership_type", Type: field.TypeString, Size: 20, Comment: "归属类型:workorder=合同号/project=科技项目号/other=其他", Default: ""}, {Name: "project_no", Type: field.TypeString, Size: 64, Comment: "工程编号(已废弃,保留防历史数据迁移)", Default: ""}, - {Name: "product_serial", Type: field.TypeString, Size: 64, Comment: "产品序号(工单内每台产品的序号)", Default: ""}, {Name: "created_by", Type: field.TypeString, Size: 64, Comment: "创建人", Default: ""}, {Name: "flow_combination", Type: field.TypeJSON, Nullable: true, Comment: "工艺组合 [{flowId,stationNo}] 按工位号升序", SchemaType: map[string]string{"postgres": "jsonb"}}, {Name: "product_process_id", Type: field.TypeInt, Comment: "来源产品工艺ID(0=无来源)", Default: 0}, @@ -1390,7 +1396,7 @@ var ( { Name: "workorder_status", Unique: false, - Columns: []*schema.Column{WorkOrderColumns[15]}, + Columns: []*schema.Column{WorkOrderColumns[14]}, }, { Name: "workorder_product_type_id", diff --git a/bj_power_mes/ent/mutation.go b/bj_power_mes/ent/mutation.go index 6d83047..21c779a 100644 --- a/bj_power_mes/ent/mutation.go +++ b/bj_power_mes/ent/mutation.go @@ -115,20 +115,28 @@ const ( // AgvPointMutation represents an operation that mutates the AgvPoint nodes in the graph. type AgvPointMutation struct { config - op Op - typ string - id *int - position_code *string - name *string - is_dock *bool - dock_id *int - adddock_id *int - enabled *bool - created_at *time.Time - clearedFields map[string]struct{} - done bool - oldValue func(context.Context) (*AgvPoint, error) - predicates []predicate.AgvPoint + op Op + typ string + id *int + position_code *string + name *string + is_dock *bool + dock_id *int + adddock_id *int + enabled *bool + locked *bool + locked_by *string + locked_reason *string + locked_at *int64 + addlocked_at *int64 + force_pick *bool + force_pick_at *int64 + addforce_pick_at *int64 + created_at *time.Time + clearedFields map[string]struct{} + done bool + oldValue func(context.Context) (*AgvPoint, error) + predicates []predicate.AgvPoint } var _ ent.Mutation = (*AgvPointMutation)(nil) @@ -443,6 +451,262 @@ func (m *AgvPointMutation) ResetEnabled() { m.enabled = nil } +// SetLocked sets the "locked" field. +func (m *AgvPointMutation) SetLocked(b bool) { + m.locked = &b +} + +// Locked returns the value of the "locked" field in the mutation. +func (m *AgvPointMutation) Locked() (r bool, exists bool) { + v := m.locked + if v == nil { + return + } + return *v, true +} + +// OldLocked returns the old "locked" field's value of the AgvPoint entity. +// If the AgvPoint object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *AgvPointMutation) OldLocked(ctx context.Context) (v bool, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldLocked is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldLocked requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldLocked: %w", err) + } + return oldValue.Locked, nil +} + +// ResetLocked resets all changes to the "locked" field. +func (m *AgvPointMutation) ResetLocked() { + m.locked = nil +} + +// SetLockedBy sets the "locked_by" field. +func (m *AgvPointMutation) SetLockedBy(s string) { + m.locked_by = &s +} + +// LockedBy returns the value of the "locked_by" field in the mutation. +func (m *AgvPointMutation) LockedBy() (r string, exists bool) { + v := m.locked_by + if v == nil { + return + } + return *v, true +} + +// OldLockedBy returns the old "locked_by" field's value of the AgvPoint entity. +// If the AgvPoint object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *AgvPointMutation) OldLockedBy(ctx context.Context) (v string, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldLockedBy is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldLockedBy requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldLockedBy: %w", err) + } + return oldValue.LockedBy, nil +} + +// ResetLockedBy resets all changes to the "locked_by" field. +func (m *AgvPointMutation) ResetLockedBy() { + m.locked_by = nil +} + +// SetLockedReason sets the "locked_reason" field. +func (m *AgvPointMutation) SetLockedReason(s string) { + m.locked_reason = &s +} + +// LockedReason returns the value of the "locked_reason" field in the mutation. +func (m *AgvPointMutation) LockedReason() (r string, exists bool) { + v := m.locked_reason + if v == nil { + return + } + return *v, true +} + +// OldLockedReason returns the old "locked_reason" field's value of the AgvPoint entity. +// If the AgvPoint object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *AgvPointMutation) OldLockedReason(ctx context.Context) (v string, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldLockedReason is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldLockedReason requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldLockedReason: %w", err) + } + return oldValue.LockedReason, nil +} + +// ResetLockedReason resets all changes to the "locked_reason" field. +func (m *AgvPointMutation) ResetLockedReason() { + m.locked_reason = nil +} + +// SetLockedAt sets the "locked_at" field. +func (m *AgvPointMutation) SetLockedAt(i int64) { + m.locked_at = &i + m.addlocked_at = nil +} + +// LockedAt returns the value of the "locked_at" field in the mutation. +func (m *AgvPointMutation) LockedAt() (r int64, exists bool) { + v := m.locked_at + if v == nil { + return + } + return *v, true +} + +// OldLockedAt returns the old "locked_at" field's value of the AgvPoint entity. +// If the AgvPoint object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *AgvPointMutation) OldLockedAt(ctx context.Context) (v int64, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldLockedAt is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldLockedAt requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldLockedAt: %w", err) + } + return oldValue.LockedAt, nil +} + +// AddLockedAt adds i to the "locked_at" field. +func (m *AgvPointMutation) AddLockedAt(i int64) { + if m.addlocked_at != nil { + *m.addlocked_at += i + } else { + m.addlocked_at = &i + } +} + +// AddedLockedAt returns the value that was added to the "locked_at" field in this mutation. +func (m *AgvPointMutation) AddedLockedAt() (r int64, exists bool) { + v := m.addlocked_at + if v == nil { + return + } + return *v, true +} + +// ResetLockedAt resets all changes to the "locked_at" field. +func (m *AgvPointMutation) ResetLockedAt() { + m.locked_at = nil + m.addlocked_at = nil +} + +// SetForcePick sets the "force_pick" field. +func (m *AgvPointMutation) SetForcePick(b bool) { + m.force_pick = &b +} + +// ForcePick returns the value of the "force_pick" field in the mutation. +func (m *AgvPointMutation) ForcePick() (r bool, exists bool) { + v := m.force_pick + if v == nil { + return + } + return *v, true +} + +// OldForcePick returns the old "force_pick" field's value of the AgvPoint entity. +// If the AgvPoint object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *AgvPointMutation) OldForcePick(ctx context.Context) (v bool, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldForcePick is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldForcePick requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldForcePick: %w", err) + } + return oldValue.ForcePick, nil +} + +// ResetForcePick resets all changes to the "force_pick" field. +func (m *AgvPointMutation) ResetForcePick() { + m.force_pick = nil +} + +// SetForcePickAt sets the "force_pick_at" field. +func (m *AgvPointMutation) SetForcePickAt(i int64) { + m.force_pick_at = &i + m.addforce_pick_at = nil +} + +// ForcePickAt returns the value of the "force_pick_at" field in the mutation. +func (m *AgvPointMutation) ForcePickAt() (r int64, exists bool) { + v := m.force_pick_at + if v == nil { + return + } + return *v, true +} + +// OldForcePickAt returns the old "force_pick_at" field's value of the AgvPoint entity. +// If the AgvPoint object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *AgvPointMutation) OldForcePickAt(ctx context.Context) (v int64, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldForcePickAt is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldForcePickAt requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldForcePickAt: %w", err) + } + return oldValue.ForcePickAt, nil +} + +// AddForcePickAt adds i to the "force_pick_at" field. +func (m *AgvPointMutation) AddForcePickAt(i int64) { + if m.addforce_pick_at != nil { + *m.addforce_pick_at += i + } else { + m.addforce_pick_at = &i + } +} + +// AddedForcePickAt returns the value that was added to the "force_pick_at" field in this mutation. +func (m *AgvPointMutation) AddedForcePickAt() (r int64, exists bool) { + v := m.addforce_pick_at + if v == nil { + return + } + return *v, true +} + +// ResetForcePickAt resets all changes to the "force_pick_at" field. +func (m *AgvPointMutation) ResetForcePickAt() { + m.force_pick_at = nil + m.addforce_pick_at = nil +} + // SetCreatedAt sets the "created_at" field. func (m *AgvPointMutation) SetCreatedAt(t time.Time) { m.created_at = &t @@ -513,7 +777,7 @@ func (m *AgvPointMutation) Type() string { // order to get all numeric fields that were incremented/decremented, call // AddedFields(). func (m *AgvPointMutation) Fields() []string { - fields := make([]string, 0, 6) + fields := make([]string, 0, 12) if m.position_code != nil { fields = append(fields, agvpoint.FieldPositionCode) } @@ -529,6 +793,24 @@ func (m *AgvPointMutation) Fields() []string { if m.enabled != nil { fields = append(fields, agvpoint.FieldEnabled) } + if m.locked != nil { + fields = append(fields, agvpoint.FieldLocked) + } + if m.locked_by != nil { + fields = append(fields, agvpoint.FieldLockedBy) + } + if m.locked_reason != nil { + fields = append(fields, agvpoint.FieldLockedReason) + } + if m.locked_at != nil { + fields = append(fields, agvpoint.FieldLockedAt) + } + if m.force_pick != nil { + fields = append(fields, agvpoint.FieldForcePick) + } + if m.force_pick_at != nil { + fields = append(fields, agvpoint.FieldForcePickAt) + } if m.created_at != nil { fields = append(fields, agvpoint.FieldCreatedAt) } @@ -550,6 +832,18 @@ func (m *AgvPointMutation) Field(name string) (ent.Value, bool) { return m.DockID() case agvpoint.FieldEnabled: return m.Enabled() + case agvpoint.FieldLocked: + return m.Locked() + case agvpoint.FieldLockedBy: + return m.LockedBy() + case agvpoint.FieldLockedReason: + return m.LockedReason() + case agvpoint.FieldLockedAt: + return m.LockedAt() + case agvpoint.FieldForcePick: + return m.ForcePick() + case agvpoint.FieldForcePickAt: + return m.ForcePickAt() case agvpoint.FieldCreatedAt: return m.CreatedAt() } @@ -571,6 +865,18 @@ func (m *AgvPointMutation) OldField(ctx context.Context, name string) (ent.Value return m.OldDockID(ctx) case agvpoint.FieldEnabled: return m.OldEnabled(ctx) + case agvpoint.FieldLocked: + return m.OldLocked(ctx) + case agvpoint.FieldLockedBy: + return m.OldLockedBy(ctx) + case agvpoint.FieldLockedReason: + return m.OldLockedReason(ctx) + case agvpoint.FieldLockedAt: + return m.OldLockedAt(ctx) + case agvpoint.FieldForcePick: + return m.OldForcePick(ctx) + case agvpoint.FieldForcePickAt: + return m.OldForcePickAt(ctx) case agvpoint.FieldCreatedAt: return m.OldCreatedAt(ctx) } @@ -617,6 +923,48 @@ func (m *AgvPointMutation) SetField(name string, value ent.Value) error { } m.SetEnabled(v) return nil + case agvpoint.FieldLocked: + v, ok := value.(bool) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetLocked(v) + return nil + case agvpoint.FieldLockedBy: + v, ok := value.(string) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetLockedBy(v) + return nil + case agvpoint.FieldLockedReason: + v, ok := value.(string) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetLockedReason(v) + return nil + case agvpoint.FieldLockedAt: + v, ok := value.(int64) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetLockedAt(v) + return nil + case agvpoint.FieldForcePick: + v, ok := value.(bool) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetForcePick(v) + return nil + case agvpoint.FieldForcePickAt: + v, ok := value.(int64) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetForcePickAt(v) + return nil case agvpoint.FieldCreatedAt: v, ok := value.(time.Time) if !ok { @@ -635,6 +983,12 @@ func (m *AgvPointMutation) AddedFields() []string { if m.adddock_id != nil { fields = append(fields, agvpoint.FieldDockID) } + if m.addlocked_at != nil { + fields = append(fields, agvpoint.FieldLockedAt) + } + if m.addforce_pick_at != nil { + fields = append(fields, agvpoint.FieldForcePickAt) + } return fields } @@ -645,6 +999,10 @@ func (m *AgvPointMutation) AddedField(name string) (ent.Value, bool) { switch name { case agvpoint.FieldDockID: return m.AddedDockID() + case agvpoint.FieldLockedAt: + return m.AddedLockedAt() + case agvpoint.FieldForcePickAt: + return m.AddedForcePickAt() } return nil, false } @@ -661,6 +1019,20 @@ func (m *AgvPointMutation) AddField(name string, value ent.Value) error { } m.AddDockID(v) return nil + case agvpoint.FieldLockedAt: + v, ok := value.(int64) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.AddLockedAt(v) + return nil + case agvpoint.FieldForcePickAt: + v, ok := value.(int64) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.AddForcePickAt(v) + return nil } return fmt.Errorf("unknown AgvPoint numeric field %s", name) } @@ -712,6 +1084,24 @@ func (m *AgvPointMutation) ResetField(name string) error { case agvpoint.FieldEnabled: m.ResetEnabled() return nil + case agvpoint.FieldLocked: + m.ResetLocked() + return nil + case agvpoint.FieldLockedBy: + m.ResetLockedBy() + return nil + case agvpoint.FieldLockedReason: + m.ResetLockedReason() + return nil + case agvpoint.FieldLockedAt: + m.ResetLockedAt() + return nil + case agvpoint.FieldForcePick: + m.ResetForcePick() + return nil + case agvpoint.FieldForcePickAt: + m.ResetForcePickAt() + return nil case agvpoint.FieldCreatedAt: m.ResetCreatedAt() return nil @@ -774,7 +1164,6 @@ type AgvTaskMutation struct { typ string id *int task_no *string - hik_task_code *string source_dock *string target_dock *string materials_json *string @@ -784,6 +1173,7 @@ type AgvTaskMutation struct { kind *string biz_type *string biz_no *string + template_type *string chain_no *string auto_end *bool agv_code *string @@ -935,42 +1325,6 @@ func (m *AgvTaskMutation) ResetTaskNo() { m.task_no = nil } -// SetHikTaskCode sets the "hik_task_code" field. -func (m *AgvTaskMutation) SetHikTaskCode(s string) { - m.hik_task_code = &s -} - -// HikTaskCode returns the value of the "hik_task_code" field in the mutation. -func (m *AgvTaskMutation) HikTaskCode() (r string, exists bool) { - v := m.hik_task_code - if v == nil { - return - } - return *v, true -} - -// OldHikTaskCode returns the old "hik_task_code" field's value of the AgvTask entity. -// If the AgvTask object wasn't provided to the builder, the object is fetched from the database. -// An error is returned if the mutation operation is not UpdateOne, or the database query fails. -func (m *AgvTaskMutation) OldHikTaskCode(ctx context.Context) (v string, err error) { - if !m.op.Is(OpUpdateOne) { - return v, errors.New("OldHikTaskCode is only allowed on UpdateOne operations") - } - if m.id == nil || m.oldValue == nil { - return v, errors.New("OldHikTaskCode requires an ID field in the mutation") - } - oldValue, err := m.oldValue(ctx) - if err != nil { - return v, fmt.Errorf("querying old value for OldHikTaskCode: %w", err) - } - return oldValue.HikTaskCode, nil -} - -// ResetHikTaskCode resets all changes to the "hik_task_code" field. -func (m *AgvTaskMutation) ResetHikTaskCode() { - m.hik_task_code = nil -} - // SetSourceDock sets the "source_dock" field. func (m *AgvTaskMutation) SetSourceDock(s string) { m.source_dock = &s @@ -1321,6 +1675,42 @@ func (m *AgvTaskMutation) ResetBizNo() { m.biz_no = nil } +// SetTemplateType sets the "template_type" field. +func (m *AgvTaskMutation) SetTemplateType(s string) { + m.template_type = &s +} + +// TemplateType returns the value of the "template_type" field in the mutation. +func (m *AgvTaskMutation) TemplateType() (r string, exists bool) { + v := m.template_type + if v == nil { + return + } + return *v, true +} + +// OldTemplateType returns the old "template_type" field's value of the AgvTask entity. +// If the AgvTask object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *AgvTaskMutation) OldTemplateType(ctx context.Context) (v string, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldTemplateType is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldTemplateType requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldTemplateType: %w", err) + } + return oldValue.TemplateType, nil +} + +// ResetTemplateType resets all changes to the "template_type" field. +func (m *AgvTaskMutation) ResetTemplateType() { + m.template_type = nil +} + // SetChainNo sets the "chain_no" field. func (m *AgvTaskMutation) SetChainNo(s string) { m.chain_no = &s @@ -1720,9 +2110,6 @@ func (m *AgvTaskMutation) Fields() []string { if m.task_no != nil { fields = append(fields, agvtask.FieldTaskNo) } - if m.hik_task_code != nil { - fields = append(fields, agvtask.FieldHikTaskCode) - } if m.source_dock != nil { fields = append(fields, agvtask.FieldSourceDock) } @@ -1750,6 +2137,9 @@ func (m *AgvTaskMutation) Fields() []string { if m.biz_no != nil { fields = append(fields, agvtask.FieldBizNo) } + if m.template_type != nil { + fields = append(fields, agvtask.FieldTemplateType) + } if m.chain_no != nil { fields = append(fields, agvtask.FieldChainNo) } @@ -1784,8 +2174,6 @@ func (m *AgvTaskMutation) Field(name string) (ent.Value, bool) { switch name { case agvtask.FieldTaskNo: return m.TaskNo() - case agvtask.FieldHikTaskCode: - return m.HikTaskCode() case agvtask.FieldSourceDock: return m.SourceDock() case agvtask.FieldTargetDock: @@ -1804,6 +2192,8 @@ func (m *AgvTaskMutation) Field(name string) (ent.Value, bool) { return m.BizType() case agvtask.FieldBizNo: return m.BizNo() + case agvtask.FieldTemplateType: + return m.TemplateType() case agvtask.FieldChainNo: return m.ChainNo() case agvtask.FieldAutoEnd: @@ -1831,8 +2221,6 @@ func (m *AgvTaskMutation) OldField(ctx context.Context, name string) (ent.Value, switch name { case agvtask.FieldTaskNo: return m.OldTaskNo(ctx) - case agvtask.FieldHikTaskCode: - return m.OldHikTaskCode(ctx) case agvtask.FieldSourceDock: return m.OldSourceDock(ctx) case agvtask.FieldTargetDock: @@ -1851,6 +2239,8 @@ func (m *AgvTaskMutation) OldField(ctx context.Context, name string) (ent.Value, return m.OldBizType(ctx) case agvtask.FieldBizNo: return m.OldBizNo(ctx) + case agvtask.FieldTemplateType: + return m.OldTemplateType(ctx) case agvtask.FieldChainNo: return m.OldChainNo(ctx) case agvtask.FieldAutoEnd: @@ -1883,13 +2273,6 @@ func (m *AgvTaskMutation) SetField(name string, value ent.Value) error { } m.SetTaskNo(v) return nil - case agvtask.FieldHikTaskCode: - v, ok := value.(string) - if !ok { - return fmt.Errorf("unexpected type %T for field %s", value, name) - } - m.SetHikTaskCode(v) - return nil case agvtask.FieldSourceDock: v, ok := value.(string) if !ok { @@ -1953,6 +2336,13 @@ func (m *AgvTaskMutation) SetField(name string, value ent.Value) error { } m.SetBizNo(v) return nil + case agvtask.FieldTemplateType: + v, ok := value.(string) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetTemplateType(v) + return nil case agvtask.FieldChainNo: v, ok := value.(string) if !ok { @@ -2121,9 +2511,6 @@ func (m *AgvTaskMutation) ResetField(name string) error { case agvtask.FieldTaskNo: m.ResetTaskNo() return nil - case agvtask.FieldHikTaskCode: - m.ResetHikTaskCode() - return nil case agvtask.FieldSourceDock: m.ResetSourceDock() return nil @@ -2151,6 +2538,9 @@ func (m *AgvTaskMutation) ResetField(name string) error { case agvtask.FieldBizNo: m.ResetBizNo() return nil + case agvtask.FieldTemplateType: + m.ResetTemplateType() + return nil case agvtask.FieldChainNo: m.ResetChainNo() return nil @@ -14095,6 +14485,7 @@ type LinePointMutation struct { addseq *int stationNo *int addstationNo *int + cacheable *bool currentSn *string orderNo *string occupied *bool @@ -14429,6 +14820,42 @@ func (m *LinePointMutation) ResetStationNo() { m.addstationNo = nil } +// SetCacheable sets the "cacheable" field. +func (m *LinePointMutation) SetCacheable(b bool) { + m.cacheable = &b +} + +// Cacheable returns the value of the "cacheable" field in the mutation. +func (m *LinePointMutation) Cacheable() (r bool, exists bool) { + v := m.cacheable + if v == nil { + return + } + return *v, true +} + +// OldCacheable returns the old "cacheable" field's value of the LinePoint entity. +// If the LinePoint object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *LinePointMutation) OldCacheable(ctx context.Context) (v bool, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldCacheable is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldCacheable requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldCacheable: %w", err) + } + return oldValue.Cacheable, nil +} + +// ResetCacheable resets all changes to the "cacheable" field. +func (m *LinePointMutation) ResetCacheable() { + m.cacheable = nil +} + // SetCurrentSn sets the "currentSn" field. func (m *LinePointMutation) SetCurrentSn(s string) { m.currentSn = &s @@ -14607,7 +15034,7 @@ func (m *LinePointMutation) Type() string { // order to get all numeric fields that were incremented/decremented, call // AddedFields(). func (m *LinePointMutation) Fields() []string { - fields := make([]string, 0, 9) + fields := make([]string, 0, 10) if m.pointType != nil { fields = append(fields, linepoint.FieldPointType) } @@ -14623,6 +15050,9 @@ func (m *LinePointMutation) Fields() []string { if m.stationNo != nil { fields = append(fields, linepoint.FieldStationNo) } + if m.cacheable != nil { + fields = append(fields, linepoint.FieldCacheable) + } if m.currentSn != nil { fields = append(fields, linepoint.FieldCurrentSn) } @@ -14653,6 +15083,8 @@ func (m *LinePointMutation) Field(name string) (ent.Value, bool) { return m.Seq() case linepoint.FieldStationNo: return m.StationNo() + case linepoint.FieldCacheable: + return m.Cacheable() case linepoint.FieldCurrentSn: return m.CurrentSn() case linepoint.FieldOrderNo: @@ -14680,6 +15112,8 @@ func (m *LinePointMutation) OldField(ctx context.Context, name string) (ent.Valu return m.OldSeq(ctx) case linepoint.FieldStationNo: return m.OldStationNo(ctx) + case linepoint.FieldCacheable: + return m.OldCacheable(ctx) case linepoint.FieldCurrentSn: return m.OldCurrentSn(ctx) case linepoint.FieldOrderNo: @@ -14732,6 +15166,13 @@ func (m *LinePointMutation) SetField(name string, value ent.Value) error { } m.SetStationNo(v) return nil + case linepoint.FieldCacheable: + v, ok := value.(bool) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetCacheable(v) + return nil case linepoint.FieldCurrentSn: v, ok := value.(string) if !ok { @@ -14851,6 +15292,9 @@ func (m *LinePointMutation) ResetField(name string) error { case linepoint.FieldStationNo: m.ResetStationNo() return nil + case linepoint.FieldCacheable: + m.ResetCacheable() + return nil case linepoint.FieldCurrentSn: m.ResetCurrentSn() return nil @@ -37286,7 +37730,6 @@ type WorkOrderMutation struct { contractNo *string ownershipType *string projectNo *string - productSerial *string createdBy *string flowCombination *[]map[string]int appendflowCombination []map[string]int @@ -37850,42 +38293,6 @@ func (m *WorkOrderMutation) ResetProjectNo() { m.projectNo = nil } -// SetProductSerial sets the "productSerial" field. -func (m *WorkOrderMutation) SetProductSerial(s string) { - m.productSerial = &s -} - -// ProductSerial returns the value of the "productSerial" field in the mutation. -func (m *WorkOrderMutation) ProductSerial() (r string, exists bool) { - v := m.productSerial - if v == nil { - return - } - return *v, true -} - -// OldProductSerial returns the old "productSerial" field's value of the WorkOrder entity. -// If the WorkOrder object wasn't provided to the builder, the object is fetched from the database. -// An error is returned if the mutation operation is not UpdateOne, or the database query fails. -func (m *WorkOrderMutation) OldProductSerial(ctx context.Context) (v string, err error) { - if !m.op.Is(OpUpdateOne) { - return v, errors.New("OldProductSerial is only allowed on UpdateOne operations") - } - if m.id == nil || m.oldValue == nil { - return v, errors.New("OldProductSerial requires an ID field in the mutation") - } - oldValue, err := m.oldValue(ctx) - if err != nil { - return v, fmt.Errorf("querying old value for OldProductSerial: %w", err) - } - return oldValue.ProductSerial, nil -} - -// ResetProductSerial resets all changes to the "productSerial" field. -func (m *WorkOrderMutation) ResetProductSerial() { - m.productSerial = nil -} - // SetCreatedBy sets the "createdBy" field. func (m *WorkOrderMutation) SetCreatedBy(s string) { m.createdBy = &s @@ -38443,7 +38850,7 @@ func (m *WorkOrderMutation) Type() string { // order to get all numeric fields that were incremented/decremented, call // AddedFields(). func (m *WorkOrderMutation) Fields() []string { - fields := make([]string, 0, 22) + fields := make([]string, 0, 21) if m.workOrderNo != nil { fields = append(fields, workorder.FieldWorkOrderNo) } @@ -38474,9 +38881,6 @@ func (m *WorkOrderMutation) Fields() []string { if m.projectNo != nil { fields = append(fields, workorder.FieldProjectNo) } - if m.productSerial != nil { - fields = append(fields, workorder.FieldProductSerial) - } if m.createdBy != nil { fields = append(fields, workorder.FieldCreatedBy) } @@ -38538,8 +38942,6 @@ func (m *WorkOrderMutation) Field(name string) (ent.Value, bool) { return m.OwnershipType() case workorder.FieldProjectNo: return m.ProjectNo() - case workorder.FieldProductSerial: - return m.ProductSerial() case workorder.FieldCreatedBy: return m.CreatedBy() case workorder.FieldFlowCombination: @@ -38591,8 +38993,6 @@ func (m *WorkOrderMutation) OldField(ctx context.Context, name string) (ent.Valu return m.OldOwnershipType(ctx) case workorder.FieldProjectNo: return m.OldProjectNo(ctx) - case workorder.FieldProductSerial: - return m.OldProductSerial(ctx) case workorder.FieldCreatedBy: return m.OldCreatedBy(ctx) case workorder.FieldFlowCombination: @@ -38694,13 +39094,6 @@ func (m *WorkOrderMutation) SetField(name string, value ent.Value) error { } m.SetProjectNo(v) return nil - case workorder.FieldProductSerial: - v, ok := value.(string) - if !ok { - return fmt.Errorf("unexpected type %T for field %s", value, name) - } - m.SetProductSerial(v) - return nil case workorder.FieldCreatedBy: v, ok := value.(string) if !ok { @@ -38965,9 +39358,6 @@ func (m *WorkOrderMutation) ResetField(name string) error { case workorder.FieldProjectNo: m.ResetProjectNo() return nil - case workorder.FieldProductSerial: - m.ResetProductSerial() - return nil case workorder.FieldCreatedBy: m.ResetCreatedBy() return nil diff --git a/bj_power_mes/ent/runtime.go b/bj_power_mes/ent/runtime.go index 55576a0..4d8862e 100644 --- a/bj_power_mes/ent/runtime.go +++ b/bj_power_mes/ent/runtime.go @@ -74,8 +74,36 @@ func init() { agvpointDescEnabled := agvpointFields[4].Descriptor() // agvpoint.DefaultEnabled holds the default value on creation for the enabled field. agvpoint.DefaultEnabled = agvpointDescEnabled.Default.(bool) + // agvpointDescLocked is the schema descriptor for locked field. + agvpointDescLocked := agvpointFields[5].Descriptor() + // agvpoint.DefaultLocked holds the default value on creation for the locked field. + agvpoint.DefaultLocked = agvpointDescLocked.Default.(bool) + // agvpointDescLockedBy is the schema descriptor for locked_by field. + agvpointDescLockedBy := agvpointFields[6].Descriptor() + // agvpoint.DefaultLockedBy holds the default value on creation for the locked_by field. + agvpoint.DefaultLockedBy = agvpointDescLockedBy.Default.(string) + // agvpoint.LockedByValidator is a validator for the "locked_by" field. It is called by the builders before save. + agvpoint.LockedByValidator = agvpointDescLockedBy.Validators[0].(func(string) error) + // agvpointDescLockedReason is the schema descriptor for locked_reason field. + agvpointDescLockedReason := agvpointFields[7].Descriptor() + // agvpoint.DefaultLockedReason holds the default value on creation for the locked_reason field. + agvpoint.DefaultLockedReason = agvpointDescLockedReason.Default.(string) + // agvpoint.LockedReasonValidator is a validator for the "locked_reason" field. It is called by the builders before save. + agvpoint.LockedReasonValidator = agvpointDescLockedReason.Validators[0].(func(string) error) + // agvpointDescLockedAt is the schema descriptor for locked_at field. + agvpointDescLockedAt := agvpointFields[8].Descriptor() + // agvpoint.DefaultLockedAt holds the default value on creation for the locked_at field. + agvpoint.DefaultLockedAt = agvpointDescLockedAt.Default.(int64) + // agvpointDescForcePick is the schema descriptor for force_pick field. + agvpointDescForcePick := agvpointFields[9].Descriptor() + // agvpoint.DefaultForcePick holds the default value on creation for the force_pick field. + agvpoint.DefaultForcePick = agvpointDescForcePick.Default.(bool) + // agvpointDescForcePickAt is the schema descriptor for force_pick_at field. + agvpointDescForcePickAt := agvpointFields[10].Descriptor() + // agvpoint.DefaultForcePickAt holds the default value on creation for the force_pick_at field. + agvpoint.DefaultForcePickAt = agvpointDescForcePickAt.Default.(int64) // agvpointDescCreatedAt is the schema descriptor for created_at field. - agvpointDescCreatedAt := agvpointFields[5].Descriptor() + agvpointDescCreatedAt := agvpointFields[11].Descriptor() // agvpoint.DefaultCreatedAt holds the default value on creation for the created_at field. agvpoint.DefaultCreatedAt = agvpointDescCreatedAt.Default.(func() time.Time) agvtaskFields := schema.AgvTask{}.Fields() @@ -84,66 +112,66 @@ func init() { agvtaskDescTaskNo := agvtaskFields[0].Descriptor() // agvtask.TaskNoValidator is a validator for the "task_no" field. It is called by the builders before save. agvtask.TaskNoValidator = agvtaskDescTaskNo.Validators[0].(func(string) error) - // agvtaskDescHikTaskCode is the schema descriptor for hik_task_code field. - agvtaskDescHikTaskCode := agvtaskFields[1].Descriptor() - // agvtask.DefaultHikTaskCode holds the default value on creation for the hik_task_code field. - agvtask.DefaultHikTaskCode = agvtaskDescHikTaskCode.Default.(string) - // agvtask.HikTaskCodeValidator is a validator for the "hik_task_code" field. It is called by the builders before save. - agvtask.HikTaskCodeValidator = agvtaskDescHikTaskCode.Validators[0].(func(string) error) // agvtaskDescSourceDock is the schema descriptor for source_dock field. - agvtaskDescSourceDock := agvtaskFields[2].Descriptor() + agvtaskDescSourceDock := agvtaskFields[1].Descriptor() // agvtask.DefaultSourceDock holds the default value on creation for the source_dock field. agvtask.DefaultSourceDock = agvtaskDescSourceDock.Default.(string) // agvtask.SourceDockValidator is a validator for the "source_dock" field. It is called by the builders before save. agvtask.SourceDockValidator = agvtaskDescSourceDock.Validators[0].(func(string) error) // agvtaskDescTargetDock is the schema descriptor for target_dock field. - agvtaskDescTargetDock := agvtaskFields[3].Descriptor() + agvtaskDescTargetDock := agvtaskFields[2].Descriptor() // agvtask.DefaultTargetDock holds the default value on creation for the target_dock field. agvtask.DefaultTargetDock = agvtaskDescTargetDock.Default.(string) // agvtask.TargetDockValidator is a validator for the "target_dock" field. It is called by the builders before save. agvtask.TargetDockValidator = agvtaskDescTargetDock.Validators[0].(func(string) error) // agvtaskDescMaterialsJSON is the schema descriptor for materials_json field. - agvtaskDescMaterialsJSON := agvtaskFields[4].Descriptor() + agvtaskDescMaterialsJSON := agvtaskFields[3].Descriptor() // agvtask.DefaultMaterialsJSON holds the default value on creation for the materials_json field. agvtask.DefaultMaterialsJSON = agvtaskDescMaterialsJSON.Default.(string) // agvtask.MaterialsJSONValidator is a validator for the "materials_json" field. It is called by the builders before save. agvtask.MaterialsJSONValidator = agvtaskDescMaterialsJSON.Validators[0].(func(string) error) // agvtaskDescRelatedRequestNo is the schema descriptor for related_request_no field. - agvtaskDescRelatedRequestNo := agvtaskFields[5].Descriptor() + agvtaskDescRelatedRequestNo := agvtaskFields[4].Descriptor() // agvtask.DefaultRelatedRequestNo holds the default value on creation for the related_request_no field. agvtask.DefaultRelatedRequestNo = agvtaskDescRelatedRequestNo.Default.(string) // agvtask.RelatedRequestNoValidator is a validator for the "related_request_no" field. It is called by the builders before save. agvtask.RelatedRequestNoValidator = agvtaskDescRelatedRequestNo.Validators[0].(func(string) error) // agvtaskDescRelatedOutboundNo is the schema descriptor for related_outbound_no field. - agvtaskDescRelatedOutboundNo := agvtaskFields[6].Descriptor() + agvtaskDescRelatedOutboundNo := agvtaskFields[5].Descriptor() // agvtask.DefaultRelatedOutboundNo holds the default value on creation for the related_outbound_no field. agvtask.DefaultRelatedOutboundNo = agvtaskDescRelatedOutboundNo.Default.(string) // agvtask.RelatedOutboundNoValidator is a validator for the "related_outbound_no" field. It is called by the builders before save. agvtask.RelatedOutboundNoValidator = agvtaskDescRelatedOutboundNo.Validators[0].(func(string) error) // agvtaskDescStatus is the schema descriptor for status field. - agvtaskDescStatus := agvtaskFields[7].Descriptor() + agvtaskDescStatus := agvtaskFields[6].Descriptor() // agvtask.DefaultStatus holds the default value on creation for the status field. agvtask.DefaultStatus = agvtaskDescStatus.Default.(string) // agvtask.StatusValidator is a validator for the "status" field. It is called by the builders before save. agvtask.StatusValidator = agvtaskDescStatus.Validators[0].(func(string) error) // agvtaskDescKind is the schema descriptor for kind field. - agvtaskDescKind := agvtaskFields[8].Descriptor() + agvtaskDescKind := agvtaskFields[7].Descriptor() // agvtask.DefaultKind holds the default value on creation for the kind field. agvtask.DefaultKind = agvtaskDescKind.Default.(string) // agvtask.KindValidator is a validator for the "kind" field. It is called by the builders before save. agvtask.KindValidator = agvtaskDescKind.Validators[0].(func(string) error) // agvtaskDescBizType is the schema descriptor for biz_type field. - agvtaskDescBizType := agvtaskFields[9].Descriptor() + agvtaskDescBizType := agvtaskFields[8].Descriptor() // agvtask.DefaultBizType holds the default value on creation for the biz_type field. agvtask.DefaultBizType = agvtaskDescBizType.Default.(string) // agvtask.BizTypeValidator is a validator for the "biz_type" field. It is called by the builders before save. agvtask.BizTypeValidator = agvtaskDescBizType.Validators[0].(func(string) error) // agvtaskDescBizNo is the schema descriptor for biz_no field. - agvtaskDescBizNo := agvtaskFields[10].Descriptor() + agvtaskDescBizNo := agvtaskFields[9].Descriptor() // agvtask.DefaultBizNo holds the default value on creation for the biz_no field. agvtask.DefaultBizNo = agvtaskDescBizNo.Default.(string) // agvtask.BizNoValidator is a validator for the "biz_no" field. It is called by the builders before save. agvtask.BizNoValidator = agvtaskDescBizNo.Validators[0].(func(string) error) + // agvtaskDescTemplateType is the schema descriptor for template_type field. + agvtaskDescTemplateType := agvtaskFields[10].Descriptor() + // agvtask.DefaultTemplateType holds the default value on creation for the template_type field. + agvtask.DefaultTemplateType = agvtaskDescTemplateType.Default.(string) + // agvtask.TemplateTypeValidator is a validator for the "template_type" field. It is called by the builders before save. + agvtask.TemplateTypeValidator = agvtaskDescTemplateType.Validators[0].(func(string) error) // agvtaskDescChainNo is the schema descriptor for chain_no field. agvtaskDescChainNo := agvtaskFields[11].Descriptor() // agvtask.DefaultChainNo holds the default value on creation for the chain_no field. @@ -908,24 +936,28 @@ func init() { linepointDescStationNo := linepointFields[5].Descriptor() // linepoint.DefaultStationNo holds the default value on creation for the stationNo field. linepoint.DefaultStationNo = linepointDescStationNo.Default.(int) + // linepointDescCacheable is the schema descriptor for cacheable field. + linepointDescCacheable := linepointFields[6].Descriptor() + // linepoint.DefaultCacheable holds the default value on creation for the cacheable field. + linepoint.DefaultCacheable = linepointDescCacheable.Default.(bool) // linepointDescCurrentSn is the schema descriptor for currentSn field. - linepointDescCurrentSn := linepointFields[6].Descriptor() + linepointDescCurrentSn := linepointFields[7].Descriptor() // linepoint.DefaultCurrentSn holds the default value on creation for the currentSn field. linepoint.DefaultCurrentSn = linepointDescCurrentSn.Default.(string) // linepoint.CurrentSnValidator is a validator for the "currentSn" field. It is called by the builders before save. linepoint.CurrentSnValidator = linepointDescCurrentSn.Validators[0].(func(string) error) // linepointDescOrderNo is the schema descriptor for orderNo field. - linepointDescOrderNo := linepointFields[7].Descriptor() + linepointDescOrderNo := linepointFields[8].Descriptor() // linepoint.DefaultOrderNo holds the default value on creation for the orderNo field. linepoint.DefaultOrderNo = linepointDescOrderNo.Default.(string) // linepoint.OrderNoValidator is a validator for the "orderNo" field. It is called by the builders before save. linepoint.OrderNoValidator = linepointDescOrderNo.Validators[0].(func(string) error) // linepointDescOccupied is the schema descriptor for occupied field. - linepointDescOccupied := linepointFields[8].Descriptor() + linepointDescOccupied := linepointFields[9].Descriptor() // linepoint.DefaultOccupied holds the default value on creation for the occupied field. linepoint.DefaultOccupied = linepointDescOccupied.Default.(bool) // linepointDescUpdatedAt is the schema descriptor for updatedAt field. - linepointDescUpdatedAt := linepointFields[9].Descriptor() + linepointDescUpdatedAt := linepointFields[10].Descriptor() // linepoint.DefaultUpdatedAt holds the default value on creation for the updatedAt field. linepoint.DefaultUpdatedAt = linepointDescUpdatedAt.Default.(func() time.Time) // linepoint.UpdateDefaultUpdatedAt holds the default value on update for the updatedAt field. @@ -2134,34 +2166,28 @@ func init() { workorder.DefaultProjectNo = workorderDescProjectNo.Default.(string) // workorder.ProjectNoValidator is a validator for the "projectNo" field. It is called by the builders before save. workorder.ProjectNoValidator = workorderDescProjectNo.Validators[0].(func(string) error) - // workorderDescProductSerial is the schema descriptor for productSerial field. - workorderDescProductSerial := workorderFields[11].Descriptor() - // workorder.DefaultProductSerial holds the default value on creation for the productSerial field. - workorder.DefaultProductSerial = workorderDescProductSerial.Default.(string) - // workorder.ProductSerialValidator is a validator for the "productSerial" field. It is called by the builders before save. - workorder.ProductSerialValidator = workorderDescProductSerial.Validators[0].(func(string) error) // workorderDescCreatedBy is the schema descriptor for createdBy field. - workorderDescCreatedBy := workorderFields[12].Descriptor() + workorderDescCreatedBy := workorderFields[11].Descriptor() // workorder.DefaultCreatedBy holds the default value on creation for the createdBy field. workorder.DefaultCreatedBy = workorderDescCreatedBy.Default.(string) // workorder.CreatedByValidator is a validator for the "createdBy" field. It is called by the builders before save. workorder.CreatedByValidator = workorderDescCreatedBy.Validators[0].(func(string) error) // workorderDescProductProcessId is the schema descriptor for productProcessId field. - workorderDescProductProcessId := workorderFields[14].Descriptor() + workorderDescProductProcessId := workorderFields[13].Descriptor() // workorder.DefaultProductProcessId holds the default value on creation for the productProcessId field. workorder.DefaultProductProcessId = workorderDescProductProcessId.Default.(int) // workorderDescStatus is the schema descriptor for status field. - workorderDescStatus := workorderFields[15].Descriptor() + workorderDescStatus := workorderFields[14].Descriptor() // workorder.DefaultStatus holds the default value on creation for the status field. workorder.DefaultStatus = workorderDescStatus.Default.(string) // workorder.StatusValidator is a validator for the "status" field. It is called by the builders before save. workorder.StatusValidator = workorderDescStatus.Validators[0].(func(string) error) // workorderDescCreatedAt is the schema descriptor for createdAt field. - workorderDescCreatedAt := workorderFields[21].Descriptor() + workorderDescCreatedAt := workorderFields[20].Descriptor() // workorder.DefaultCreatedAt holds the default value on creation for the createdAt field. workorder.DefaultCreatedAt = workorderDescCreatedAt.Default.(func() time.Time) // workorderDescUpdatedAt is the schema descriptor for updatedAt field. - workorderDescUpdatedAt := workorderFields[22].Descriptor() + workorderDescUpdatedAt := workorderFields[21].Descriptor() // workorder.DefaultUpdatedAt holds the default value on creation for the updatedAt field. workorder.DefaultUpdatedAt = workorderDescUpdatedAt.Default.(func() time.Time) // workorder.UpdateDefaultUpdatedAt holds the default value on update for the updatedAt field. diff --git a/bj_power_mes/ent/workorder.go b/bj_power_mes/ent/workorder.go index be0038d..b45964f 100644 --- a/bj_power_mes/ent/workorder.go +++ b/bj_power_mes/ent/workorder.go @@ -38,8 +38,6 @@ type WorkOrder struct { OwnershipType string `json:"ownershipType,omitempty"` // 工程编号(已废弃,保留防历史数据迁移) ProjectNo string `json:"projectNo,omitempty"` - // 产品序号(工单内每台产品的序号) - ProductSerial string `json:"productSerial,omitempty"` // 创建人 CreatedBy string `json:"createdBy,omitempty"` // 工艺组合 [{flowId,stationNo}] 按工位号升序 @@ -74,7 +72,7 @@ func (*WorkOrder) scanValues(columns []string) ([]any, error) { values[i] = new([]byte) case workorder.FieldID, workorder.FieldProductTypeId, workorder.FieldQuantity, workorder.FieldFinishedNum, workorder.FieldFailNum, workorder.FieldProductProcessId: values[i] = new(sql.NullInt64) - case workorder.FieldWorkOrderNo, workorder.FieldProductCode, workorder.FieldProductName, workorder.FieldContractNo, workorder.FieldOwnershipType, workorder.FieldProjectNo, workorder.FieldProductSerial, workorder.FieldCreatedBy, workorder.FieldStatus: + case workorder.FieldWorkOrderNo, workorder.FieldProductCode, workorder.FieldProductName, workorder.FieldContractNo, workorder.FieldOwnershipType, workorder.FieldProjectNo, workorder.FieldCreatedBy, workorder.FieldStatus: values[i] = new(sql.NullString) case workorder.FieldPlanStart, workorder.FieldPlanEnd, workorder.FieldCompletedAt, workorder.FieldActualStart, workorder.FieldCreatedAt, workorder.FieldUpdatedAt: values[i] = new(sql.NullTime) @@ -159,12 +157,6 @@ func (_m *WorkOrder) assignValues(columns []string, values []any) error { } else if value.Valid { _m.ProjectNo = value.String } - case workorder.FieldProductSerial: - if value, ok := values[i].(*sql.NullString); !ok { - return fmt.Errorf("unexpected type %T for field productSerial", values[i]) - } else if value.Valid { - _m.ProductSerial = value.String - } case workorder.FieldCreatedBy: if value, ok := values[i].(*sql.NullString); !ok { return fmt.Errorf("unexpected type %T for field createdBy", values[i]) @@ -306,9 +298,6 @@ func (_m *WorkOrder) String() string { builder.WriteString("projectNo=") builder.WriteString(_m.ProjectNo) builder.WriteString(", ") - builder.WriteString("productSerial=") - builder.WriteString(_m.ProductSerial) - builder.WriteString(", ") builder.WriteString("createdBy=") builder.WriteString(_m.CreatedBy) builder.WriteString(", ") diff --git a/bj_power_mes/ent/workorder/where.go b/bj_power_mes/ent/workorder/where.go index e32da5b..b7b5299 100644 --- a/bj_power_mes/ent/workorder/where.go +++ b/bj_power_mes/ent/workorder/where.go @@ -104,11 +104,6 @@ func ProjectNo(v string) predicate.WorkOrder { return predicate.WorkOrder(sql.FieldEQ(FieldProjectNo, v)) } -// ProductSerial applies equality check predicate on the "productSerial" field. It's identical to ProductSerialEQ. -func ProductSerial(v string) predicate.WorkOrder { - return predicate.WorkOrder(sql.FieldEQ(FieldProductSerial, v)) -} - // CreatedBy applies equality check predicate on the "createdBy" field. It's identical to CreatedByEQ. func CreatedBy(v string) predicate.WorkOrder { return predicate.WorkOrder(sql.FieldEQ(FieldCreatedBy, v)) @@ -704,71 +699,6 @@ func ProjectNoContainsFold(v string) predicate.WorkOrder { return predicate.WorkOrder(sql.FieldContainsFold(FieldProjectNo, v)) } -// ProductSerialEQ applies the EQ predicate on the "productSerial" field. -func ProductSerialEQ(v string) predicate.WorkOrder { - return predicate.WorkOrder(sql.FieldEQ(FieldProductSerial, v)) -} - -// ProductSerialNEQ applies the NEQ predicate on the "productSerial" field. -func ProductSerialNEQ(v string) predicate.WorkOrder { - return predicate.WorkOrder(sql.FieldNEQ(FieldProductSerial, v)) -} - -// ProductSerialIn applies the In predicate on the "productSerial" field. -func ProductSerialIn(vs ...string) predicate.WorkOrder { - return predicate.WorkOrder(sql.FieldIn(FieldProductSerial, vs...)) -} - -// ProductSerialNotIn applies the NotIn predicate on the "productSerial" field. -func ProductSerialNotIn(vs ...string) predicate.WorkOrder { - return predicate.WorkOrder(sql.FieldNotIn(FieldProductSerial, vs...)) -} - -// ProductSerialGT applies the GT predicate on the "productSerial" field. -func ProductSerialGT(v string) predicate.WorkOrder { - return predicate.WorkOrder(sql.FieldGT(FieldProductSerial, v)) -} - -// ProductSerialGTE applies the GTE predicate on the "productSerial" field. -func ProductSerialGTE(v string) predicate.WorkOrder { - return predicate.WorkOrder(sql.FieldGTE(FieldProductSerial, v)) -} - -// ProductSerialLT applies the LT predicate on the "productSerial" field. -func ProductSerialLT(v string) predicate.WorkOrder { - return predicate.WorkOrder(sql.FieldLT(FieldProductSerial, v)) -} - -// ProductSerialLTE applies the LTE predicate on the "productSerial" field. -func ProductSerialLTE(v string) predicate.WorkOrder { - return predicate.WorkOrder(sql.FieldLTE(FieldProductSerial, v)) -} - -// ProductSerialContains applies the Contains predicate on the "productSerial" field. -func ProductSerialContains(v string) predicate.WorkOrder { - return predicate.WorkOrder(sql.FieldContains(FieldProductSerial, v)) -} - -// ProductSerialHasPrefix applies the HasPrefix predicate on the "productSerial" field. -func ProductSerialHasPrefix(v string) predicate.WorkOrder { - return predicate.WorkOrder(sql.FieldHasPrefix(FieldProductSerial, v)) -} - -// ProductSerialHasSuffix applies the HasSuffix predicate on the "productSerial" field. -func ProductSerialHasSuffix(v string) predicate.WorkOrder { - return predicate.WorkOrder(sql.FieldHasSuffix(FieldProductSerial, v)) -} - -// ProductSerialEqualFold applies the EqualFold predicate on the "productSerial" field. -func ProductSerialEqualFold(v string) predicate.WorkOrder { - return predicate.WorkOrder(sql.FieldEqualFold(FieldProductSerial, v)) -} - -// ProductSerialContainsFold applies the ContainsFold predicate on the "productSerial" field. -func ProductSerialContainsFold(v string) predicate.WorkOrder { - return predicate.WorkOrder(sql.FieldContainsFold(FieldProductSerial, v)) -} - // CreatedByEQ applies the EQ predicate on the "createdBy" field. func CreatedByEQ(v string) predicate.WorkOrder { return predicate.WorkOrder(sql.FieldEQ(FieldCreatedBy, v)) diff --git a/bj_power_mes/ent/workorder/workorder.go b/bj_power_mes/ent/workorder/workorder.go index 21b0244..69eb7d3 100644 --- a/bj_power_mes/ent/workorder/workorder.go +++ b/bj_power_mes/ent/workorder/workorder.go @@ -33,8 +33,6 @@ const ( FieldOwnershipType = "ownership_type" // FieldProjectNo holds the string denoting the projectno field in the database. FieldProjectNo = "project_no" - // FieldProductSerial holds the string denoting the productserial field in the database. - FieldProductSerial = "product_serial" // FieldCreatedBy holds the string denoting the createdby field in the database. FieldCreatedBy = "created_by" // FieldFlowCombination holds the string denoting the flowcombination field in the database. @@ -74,7 +72,6 @@ var Columns = []string{ FieldContractNo, FieldOwnershipType, FieldProjectNo, - FieldProductSerial, FieldCreatedBy, FieldFlowCombination, FieldProductProcessId, @@ -127,10 +124,6 @@ var ( DefaultProjectNo string // ProjectNoValidator is a validator for the "projectNo" field. It is called by the builders before save. ProjectNoValidator func(string) error - // DefaultProductSerial holds the default value on creation for the "productSerial" field. - DefaultProductSerial string - // ProductSerialValidator is a validator for the "productSerial" field. It is called by the builders before save. - ProductSerialValidator func(string) error // DefaultCreatedBy holds the default value on creation for the "createdBy" field. DefaultCreatedBy string // CreatedByValidator is a validator for the "createdBy" field. It is called by the builders before save. @@ -209,11 +202,6 @@ func ByProjectNo(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldProjectNo, opts...).ToFunc() } -// ByProductSerial orders the results by the productSerial field. -func ByProductSerial(opts ...sql.OrderTermOption) OrderOption { - return sql.OrderByField(FieldProductSerial, opts...).ToFunc() -} - // ByCreatedBy orders the results by the createdBy field. func ByCreatedBy(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldCreatedBy, opts...).ToFunc() diff --git a/bj_power_mes/ent/workorder_create.go b/bj_power_mes/ent/workorder_create.go index fef7d55..dda080f 100644 --- a/bj_power_mes/ent/workorder_create.go +++ b/bj_power_mes/ent/workorder_create.go @@ -144,20 +144,6 @@ func (_c *WorkOrderCreate) SetNillableProjectNo(v *string) *WorkOrderCreate { return _c } -// SetProductSerial sets the "productSerial" field. -func (_c *WorkOrderCreate) SetProductSerial(v string) *WorkOrderCreate { - _c.mutation.SetProductSerial(v) - return _c -} - -// SetNillableProductSerial sets the "productSerial" field if the given value is not nil. -func (_c *WorkOrderCreate) SetNillableProductSerial(v *string) *WorkOrderCreate { - if v != nil { - _c.SetProductSerial(*v) - } - return _c -} - // SetCreatedBy sets the "createdBy" field. func (_c *WorkOrderCreate) SetCreatedBy(v string) *WorkOrderCreate { _c.mutation.SetCreatedBy(v) @@ -369,10 +355,6 @@ func (_c *WorkOrderCreate) defaults() { v := workorder.DefaultProjectNo _c.mutation.SetProjectNo(v) } - if _, ok := _c.mutation.ProductSerial(); !ok { - v := workorder.DefaultProductSerial - _c.mutation.SetProductSerial(v) - } if _, ok := _c.mutation.CreatedBy(); !ok { v := workorder.DefaultCreatedBy _c.mutation.SetCreatedBy(v) @@ -457,14 +439,6 @@ func (_c *WorkOrderCreate) check() error { return &ValidationError{Name: "projectNo", err: fmt.Errorf(`ent: validator failed for field "WorkOrder.projectNo": %w`, err)} } } - if _, ok := _c.mutation.ProductSerial(); !ok { - return &ValidationError{Name: "productSerial", err: errors.New(`ent: missing required field "WorkOrder.productSerial"`)} - } - if v, ok := _c.mutation.ProductSerial(); ok { - if err := workorder.ProductSerialValidator(v); err != nil { - return &ValidationError{Name: "productSerial", err: fmt.Errorf(`ent: validator failed for field "WorkOrder.productSerial": %w`, err)} - } - } if _, ok := _c.mutation.CreatedBy(); !ok { return &ValidationError{Name: "createdBy", err: errors.New(`ent: missing required field "WorkOrder.createdBy"`)} } @@ -564,10 +538,6 @@ func (_c *WorkOrderCreate) createSpec() (*WorkOrder, *sqlgraph.CreateSpec) { _spec.SetField(workorder.FieldProjectNo, field.TypeString, value) _node.ProjectNo = value } - if value, ok := _c.mutation.ProductSerial(); ok { - _spec.SetField(workorder.FieldProductSerial, field.TypeString, value) - _node.ProductSerial = value - } if value, ok := _c.mutation.CreatedBy(); ok { _spec.SetField(workorder.FieldCreatedBy, field.TypeString, value) _node.CreatedBy = value diff --git a/bj_power_mes/ent/workorder_update.go b/bj_power_mes/ent/workorder_update.go index 639c59b..9edb919 100644 --- a/bj_power_mes/ent/workorder_update.go +++ b/bj_power_mes/ent/workorder_update.go @@ -198,20 +198,6 @@ func (_u *WorkOrderUpdate) SetNillableProjectNo(v *string) *WorkOrderUpdate { return _u } -// SetProductSerial sets the "productSerial" field. -func (_u *WorkOrderUpdate) SetProductSerial(v string) *WorkOrderUpdate { - _u.mutation.SetProductSerial(v) - return _u -} - -// SetNillableProductSerial sets the "productSerial" field if the given value is not nil. -func (_u *WorkOrderUpdate) SetNillableProductSerial(v *string) *WorkOrderUpdate { - if v != nil { - _u.SetProductSerial(*v) - } - return _u -} - // SetCreatedBy sets the "createdBy" field. func (_u *WorkOrderUpdate) SetCreatedBy(v string) *WorkOrderUpdate { _u.mutation.SetCreatedBy(v) @@ -456,11 +442,6 @@ func (_u *WorkOrderUpdate) check() error { return &ValidationError{Name: "projectNo", err: fmt.Errorf(`ent: validator failed for field "WorkOrder.projectNo": %w`, err)} } } - if v, ok := _u.mutation.ProductSerial(); ok { - if err := workorder.ProductSerialValidator(v); err != nil { - return &ValidationError{Name: "productSerial", err: fmt.Errorf(`ent: validator failed for field "WorkOrder.productSerial": %w`, err)} - } - } if v, ok := _u.mutation.CreatedBy(); ok { if err := workorder.CreatedByValidator(v); err != nil { return &ValidationError{Name: "createdBy", err: fmt.Errorf(`ent: validator failed for field "WorkOrder.createdBy": %w`, err)} @@ -534,9 +515,6 @@ func (_u *WorkOrderUpdate) sqlSave(ctx context.Context) (_node int, err error) { if value, ok := _u.mutation.ProjectNo(); ok { _spec.SetField(workorder.FieldProjectNo, field.TypeString, value) } - if value, ok := _u.mutation.ProductSerial(); ok { - _spec.SetField(workorder.FieldProductSerial, field.TypeString, value) - } if value, ok := _u.mutation.CreatedBy(); ok { _spec.SetField(workorder.FieldCreatedBy, field.TypeString, value) } @@ -786,20 +764,6 @@ func (_u *WorkOrderUpdateOne) SetNillableProjectNo(v *string) *WorkOrderUpdateOn return _u } -// SetProductSerial sets the "productSerial" field. -func (_u *WorkOrderUpdateOne) SetProductSerial(v string) *WorkOrderUpdateOne { - _u.mutation.SetProductSerial(v) - return _u -} - -// SetNillableProductSerial sets the "productSerial" field if the given value is not nil. -func (_u *WorkOrderUpdateOne) SetNillableProductSerial(v *string) *WorkOrderUpdateOne { - if v != nil { - _u.SetProductSerial(*v) - } - return _u -} - // SetCreatedBy sets the "createdBy" field. func (_u *WorkOrderUpdateOne) SetCreatedBy(v string) *WorkOrderUpdateOne { _u.mutation.SetCreatedBy(v) @@ -1057,11 +1021,6 @@ func (_u *WorkOrderUpdateOne) check() error { return &ValidationError{Name: "projectNo", err: fmt.Errorf(`ent: validator failed for field "WorkOrder.projectNo": %w`, err)} } } - if v, ok := _u.mutation.ProductSerial(); ok { - if err := workorder.ProductSerialValidator(v); err != nil { - return &ValidationError{Name: "productSerial", err: fmt.Errorf(`ent: validator failed for field "WorkOrder.productSerial": %w`, err)} - } - } if v, ok := _u.mutation.CreatedBy(); ok { if err := workorder.CreatedByValidator(v); err != nil { return &ValidationError{Name: "createdBy", err: fmt.Errorf(`ent: validator failed for field "WorkOrder.createdBy": %w`, err)} @@ -1152,9 +1111,6 @@ func (_u *WorkOrderUpdateOne) sqlSave(ctx context.Context) (_node *WorkOrder, er if value, ok := _u.mutation.ProjectNo(); ok { _spec.SetField(workorder.FieldProjectNo, field.TypeString, value) } - if value, ok := _u.mutation.ProductSerial(); ok { - _spec.SetField(workorder.FieldProductSerial, field.TypeString, value) - } if value, ok := _u.mutation.CreatedBy(); ok { _spec.SetField(workorder.FieldCreatedBy, field.TypeString, value) } diff --git a/bj_power_mes/etc/bj_power_mes-api.yaml b/bj_power_mes/etc/bj_power_mes-api.yaml index 84a7af6..6b08b2a 100644 --- a/bj_power_mes/etc/bj_power_mes-api.yaml +++ b/bj_power_mes/etc/bj_power_mes-api.yaml @@ -15,11 +15,6 @@ Database: MaxIdle: 10 MaxOpen: 20 -# Redis(看板缓存 + 防击穿) -Redis: - Host: 127.0.0.1:6379 - Type: node - # JWT(统一密钥 Hardman_2026,access 短有效 + refresh 滑动续签) Auth: AccessSecret: Hardman_2026 @@ -64,6 +59,9 @@ Agv: CarrierCode: "" MapCode: "" Priority: "1" + # 动作模板(模板跟着任务段走:段起点或终点涉及接驳台=举升模板,纯停靠=非举升模板;下派时自动推导,不留给人工选) + TaskTypLift: "F01" # 举升模板的 RCS 任务类型编号(默认 F01 厂内货架搬运) + TaskTypPlain: "F01" # 非举升模板的 RCS 任务类型编号(现场 RCS 配置出编号后修改) # 扫码中间件(键盘 HID 注入):默认关闭。需用扫码枪注入时才改 Enabled: true 并重启。 # 注意:若 MES 与 WMS 同机且都开,7757 谁先启动谁监听,后到的只记日志(不退出、不影响主进程)。 diff --git a/bj_power_mes/frontend/src/help.js b/bj_power_mes/frontend/src/help.js index d72e675..721ac19 100644 --- a/bj_power_mes/frontend/src/help.js +++ b/bj_power_mes/frontend/src/help.js @@ -5,14 +5,14 @@ export const helpProductType = { title: '物料档案(档案维护)', overview: - '物料档案 = 本页是 WMS「基础数据(物料主数据)」中"成品"物料类别在本系统的视图,与 WMS 指向同一份主数据(以 WMS 为准,实时拉取、不双录)。本页承载的是"要生产哪些成品",是整条产线的源头基础数据。\n\n物料类别来源(与 WMS 一致):原材料=进货来的(外购);半成品、成品=自己生产的;其他=辅料/工装/试验设备等。成品还可以作为零部件,放进另一个成品的物料清单里被再次加工成新的成品。\n\n主数据链条:物料档案(成品) → 工单(选成品+物料清单) → 物料清单(给该产品序号配料) → 日排产 → 备料单 → 库房出库 → 产线生产 → 完工成品自动回流 WMS 入库。\n\n关系说明(几对几):\n· 成品 ↔ 工单:1 对 N。一个成品可以建多个工单(同一型号今天做一批、明天做一批,产品工号不同、产品序号相同)。\n· 成品 ↔ 物料清单:1 对多(选用制)。同一成品可并存多份物料清单(不同厂家供货/含半成品结构),用「物料清单名称」区分,工单建单时选定一份,备料/装机都按工单锁定的那份算。\n· 成品 ↔ 备料单:间接。备料单由「日排产 × 工单锁定的物料清单」算出,与成品无直接约束。\n· 强约束:工单/物料清单都挂在产品序号下,成品编码变了,下游关联会断,建议建好后不要改。\n· 与 WMS 的关系:两套系统解耦。物料/图号主数据以 WMS 为单一来源,MES 实时拉取(WMS 不可达时降级为本地只读缓存);成品完工后由系统自动生成 SN 回流 WMS 入库,无需人工对账。\n\n批量建档(Excel 导入):列表工具栏提供「模板下载」与「Excel 导入」——先下载模板(列:图号/名称/规格/单位/说明/类型/序列号/启用),按行填好后上传;系统逐行校验、逐行导入,完成后提示成功与失败行数,并列出失败原因(如编码重复、必填缺失),修正后可重新上传。', + '物料档案 = 本页是 WMS「基础数据(物料主数据)」中"成品"物料类别在本系统的视图,与 WMS 两库对等双向同步(按物料编码幂等互推,任一侧修改自动互推;库存真源在 WMS,备料校验直查 WMS)。本页承载的是"要生产哪些成品",是整条产线的源头基础数据。\n\n物料类别来源(与 WMS 一致):原材料=进货来的(外购);半成品、成品=自己生产的;其他=辅料/工装/试验设备等。成品还可以作为零部件,放进另一个成品的物料清单里被再次加工成新的成品。\n\n主数据链条:物料档案(成品) → 工单(选成品+物料清单) → 物料清单(给该图号配料) → 日排产 → 备料单 → 库房出库 → 产线生产 → 完工成品自动回流 WMS 入库。\n\n关系说明(几对几):\n· 成品 ↔ 工单:1 对 N。一个成品可以建多个工单(同一型号今天做一批、明天做一批,产品工号不同、图号相同)。\n· 成品 ↔ 物料清单:1 对多(选用制)。同一成品可并存多份物料清单(不同厂家供货/含半成品结构),用「物料清单名称」区分,工单建单时选定一份,备料/装机都按工单锁定的那份算。\n· 成品 ↔ 备料单:间接。备料单由「日排产 × 工单锁定的物料清单」算出,与成品无直接约束。\n· 强约束:工单/物料清单都挂在图号下,成品编码变了,下游关联会断,建议建好后不要改。\n· 与 WMS 的关系:两库对等双向同步(按物料编码幂等互推,任一侧新增/修改自动互推,失败置同步标记可手动重推);MES 持本地副本,冷启动全量拉取兜底;库存真源在 WMS,备料校验直查 WMS。成品完工后由系统自动生成 SN 回流 WMS 入库,无需人工对账。\n\n批量建档(Excel 导入):列表工具栏提供「模板下载」与「Excel 导入」——先下载模板(列:图号/名称/规格/单位/说明/类型/序列号/启用),按行填好后上传;系统逐行校验、逐行导入,完成后提示成功与失败行数,并列出失败原因(如编码重复、必填缺失),修正后可重新上传。', fields: [ { name: '名称', source: '手工填写(必填)。用户自定义,无上游来源。', purpose: '成品的中文名,用于识别与下拉展示', fill: '如:智能电表、断路器、配电柜' }, { name: '编码', - source: '系统自动生成 + 可手动修改。新建时会自动带出(格式 PROD-YYYYMMDD-序号),你可直接使用或改为自定义编码;编辑时保留已存值。一个产品序号可对应多个工单(同一型号今天做一批、明天做一批,产品工号不同,产品序号相同)。', + source: '系统自动生成 + 可手动修改。新建时会自动带出(格式 PROD-YYYYMMDD-序号),你可直接使用或改为自定义编码;编辑时保留已存值。一个图号可对应多个工单(同一型号今天做一批、明天做一批,产品工号不同,图号相同)。', purpose: '产品唯一编码。它是 MES 内部识别该产品的标识,决定该产品的物料清单内容,也是工单、备料、拧紧、追溯的挂靠键。', - fill: '建议用有意义的编码,如 METER-01。要点:①两库对等(2026-09-29):本页读写 MES 本地物料副本并自动同步 WMS,WMS 宕机时新建/查询照常可用,推送失败自动重推;②建档必选「类型」(结构件/电气件/其他)与「序列号」(序列号=是(逐件录SN)/ 序列号=否(按批次数量),选类型自动带默认可改);③成品完工回流 WMS 入库:序列号=是以扫入的来料SN入账、序列号=否由系统发号,无需人工对账;④如产品序号就是成品编码,则直接沿用该编码即可;⑤建好后不要随意改,否则下游工单/追溯的关联会断。' + fill: '建议用有意义的编码,如 METER-01。要点:①两库对等(2026-09-29):本页读写 MES 本地物料副本并自动同步 WMS,WMS 宕机时新建/查询照常可用,推送失败自动重推;②建档必选「类型」(结构件/电气件/其他)与「序列号」(序列号=是(逐件录SN)/ 序列号=否(按批次数量),选类型自动带默认可改);③成品完工回流 WMS 入库:序列号=是以扫入的来料SN入账、序列号=否由系统发号,无需人工对账;④如图号就是成品编码,则直接沿用该编码即可;⑤建好后不要随意改,否则下游工单/追溯的关联会断。' }, { name: '规格', source: '手工填写(必填)。与 WMS 物料档案必填口径一致。', purpose: '成品的规格型号,用于识别与打印', fill: '如:500×300×200' }, { name: '单位', source: '手工填写(必填)。与 WMS 物料档案必填口径一致。', purpose: '计量单位', fill: '如:台 / 套' }, @@ -28,18 +28,17 @@ export const helpProductType = { export const helpWorkOrder = { title: '工单管理(新建 / 编辑 / 删除工单)', overview: - '工单 = 一个"生产批次"的唯一载体,是生产执行和仓库出库挂靠的核心对象。\n\n全流程:先有产品型号(在「物料档案」里建档) → 建工单(选产品型号、定数量、勾选工艺组合) → 进"工艺"给工艺维护工艺步骤与物料清单 → 到"日排产"排哪天产多少 → 仓库按排产备料出库 → 产线装配/拧紧/报工 → 完工(成品 SN 系统自动生成,并自动回流 WMS 入库为"成品"物料类别)。\n产品工号会贯穿 备料单、工件追溯、操作日志 全链路。\n\n客户编号体系(三级归属):一级=合同号/科技项目号(二选一,即「归属类型+归属编号」)→ 二级=产品工号(原工单号,一个产品工号对应一个新建工单/一批)→ 三级=产品序号(工单内每台)。产品编码=图号(与产品型号编码同值,随型号自动带出)。原「工程编号」已被合同号顶替,页面不再展示/录入/查询。\n\n查询:支持按 产品工号 / 图号 / 产品名称(模糊) / 归属类型 / 归属编号 / 状态 组合筛选;操作列「详情」可查看工单字段汇总、工艺路线(按工位号升序去重展示各道工艺与步骤)与该工单的工件SN列表(产品序号/SN/类型/状态/当前工位);删除:仅「已创建」且无排产、备料、生产数据的工单可删除,生产中或已完成的工单不可删除。', + '工单 = 一个"生产批次"的唯一载体,是生产执行和仓库出库挂靠的核心对象。\n\n全流程:先有产品型号(在「物料档案」里建档) → 建工单(选产品型号、定数量、勾选工艺组合) → 进"工艺"给工艺维护工艺步骤与物料清单 → 到"日排产"排哪天产多少 → 仓库按排产备料出库 → 产线装配/拧紧/报工 → 完工(成品 SN 系统自动生成,并自动回流 WMS 入库为"成品"物料类别)。\n产品工号会贯穿 备料单、工件追溯、操作日志 全链路。\n\n客户编号体系(三级归属):一级=合同号/科技项目号(二选一,即「归属类型+归属编号」)→ 二级=产品工号(原工单号,一个产品工号对应一个新建工单/一批)→ 三级=SN(每台工件的序列号,工件建档时生成、落在工件上,不是工单级字段——工单级「产品序号」字段已于 2026-11-06 删除)。产品编码=图号(与产品型号编码同值,随型号自动带出)。原「工程编号」已被合同号顶替,页面不再展示/录入/查询。\n\n查询:支持按 产品工号 / 图号 / 产品名称(模糊) / 归属类型 / 归属编号 / 状态 组合筛选;操作列「详情」可查看工单字段汇总、工艺路线(按工位号升序去重展示各道工艺与步骤)与该工单的工件SN列表(产品序号/SN/类型/状态/当前工位);删除:仅「已创建」且无排产、备料、生产数据的工单可删除,生产中或已完成的工单不可删除;删除不可恢复。', sections: [ { title: '工单基本信息', fields: [ { name: '产品工号', source: '系统自动生成(WO+时间戳),可手工改。新建时自动带出。', purpose: '唯一标识一批生产(原"工单号"),备料/出库/报工/追溯都挂在此号下', fill: '一般不用改;如改动须保证唯一' }, { name: '产品型号', source: '下拉选择。数据来自「物料档案」页面已启用的记录。', purpose: '说明这批生产的是什么产品,并决定物料清单内容', fill: '先到「物料档案」页面建好记录再选择' }, - { name: '图号', source: '随产品型号自动带出(产品序号=图号,同值)。', purpose: '产品的图样编号,用于展示与追溯', fill: '随型号带出无需手填;未选型号时可手工填写' }, + { name: '图号', source: '随产品型号自动带出(产品编码=图号,同值)。', purpose: '产品的图样编号,用于展示与追溯', fill: '随型号带出无需手填;未选型号时可手工填写' }, { name: '产品名称', source: '随产品型号自动带出。', purpose: '产品中文名,用于展示', fill: '随型号带出,无需手填' }, { name: '归属类型', source: '下拉必选:合同号 / 科技项目号 / 其他。', purpose: '一级归属的类型标记(合同号/科技项目号二选一)', fill: '按订单来源选择;归属会随半成品流转自动继承到 WMS' }, { name: '归属编号', source: '手工填写。随归属类型填合同号或科技项目号。', purpose: '一级归属编号(合同号/科技项目号二选一)', fill: '如 HT-2026-001 或 KJ-2026-001;选「其他」可不填' }, - { name: '产品序号', source: '手工填写。', purpose: '三级归属:本工单内每台产品的序号,用于区分同批不同台', fill: '如 01、02(可空)' }, { name: '数量', source: '手工填写整数。', purpose: '本工单生产总数量(合同台数),决定需求量与排产上限', fill: '整数 ≥1,如 100' }, { name: '工序工位', source: '按产品工艺的工序顺序,每道工序从下拉选一个工位(候选=工位管理里绑定该工序的启用工位)。保存为 [{flowId,stationNo}]。', purpose: '本工单的执行路线;自动排产/备料拆分/产线下发均按此组合派生', fill: '系统按工艺顺序自动推荐工位(第1道取候选最小工位,第N道取大于上一道已选且候选最小的工位);可逐道修改,下拉只列合法候选(第N道候选=绑定该工序且工位号>第N-1道已选);工位号须按工序顺序严格递增' }, { name: '状态', source: '新建时选"已创建",后续由流程推进。', purpose: '工单生命周期:创建→发布→生产→完成', fill: '新建时选"已创建";也可在列表操作列点「状态」快捷流转(发布/开工/完工)' }, @@ -50,9 +49,9 @@ export const helpWorkOrder = { }, { title: '工单详情', - overview: '列表操作列「详情」打开只读抽屉:上半部分为工单字段汇总(产品工号/图号/名称/归属/数量/状态/日期),下半部分为该工单的工件SN列表。\n工件SN列表数据来源=工件进线登记记录:支持按状态筛选与分页(默认每页 100 条,后端分页),按产品序号升序(小号在前);产品序号取 SN 末段序号,SN 为工件唯一序列号,类型(序列号=是/序列号=否)取自图号对应物料档案的「序列号」设置,状态与当前工位为实时生产进度。', + overview: '列表操作列「详情」打开只读抽屉:上半部分为工单字段汇总(产品工号/图号/名称/归属/数量/状态/日期),下半部分为该工单的工件SN列表。\n工件SN列表数据来源=工件进线登记记录:支持按状态筛选与分页(默认每页 100 条,后端分页),按SN升序(小号在前);「SN末段」列取 SN 末段序号,SN 为工件唯一序列号(产品序号=SN,每台工件的序号、不是工单级字段),类型(序列号=是/序列号=否)取自图号对应物料档案的「序列号」设置,状态与当前工位为实时生产进度。', fields: [ - { name: '工件SN列表', source: '工件查询接口按产品工号过滤,后端 SQL 分页(默认 100/页,可切 100/200/500)+ 状态筛选,按 SN 升序(产品序号小号在前),实时读取。', purpose: '核对该批每台产品的 序号、SN、类型、状态与当前工位', fill: '只读;可用状态下拉筛选,翻页查看' } + { name: '工件SN列表', source: '工件查询接口按产品工号过滤,后端 SQL 分页(默认 100/页,可切 100/200/500)+ 状态筛选,按 SN 升序(小号在前),实时读取。', purpose: '核对该批每台工件的 SN、SN末段、类型、状态与当前工位', fill: '只读;可用状态下拉筛选,翻页查看' } ] }, { @@ -134,7 +133,7 @@ export const helpQtyReport = { fields: [ { name: '补发', source: '人工在本页操作。', purpose: '少发时补齐差额(生成工位补料单)', fill: '点「补发」→ 确认' }, { name: '退库', source: '人工在本页操作。', purpose: '多发/错发时退回仓库(生成退库单)', fill: '点「退库」→ 确认' }, - { name: '调整', source: '人工在本页操作(需填处理说明)。', purpose: '少量差异双方确认后关闭', fill: '点「调整」→ 填说明 → 确认' } + { name: '调整', source: '人工在本页操作(需填处理说明)。', purpose: '少量差异双方确认后关闭', fill: '点「调整」→ 填说明 → 确认。注意:调整即终局——差异关闭后不再补发也不退库,且不可撤销;拿不准走补发/退库' } ] } ] @@ -168,7 +167,7 @@ export const helpStation = { { name: '接驳台编码', source: '系统预置(种子初始化),与工位 1:1。', purpose: '该工位绑定的接驳台唯一标识', fill: '只读;由种子初始化,页面不可更改' }, { name: '绑定工艺', source: '本页下拉选择「启用」的工艺即完成绑定。', purpose: '该工位执行的工艺(决定工艺步骤/考核标准/PDF/物料清单);一个工位只能绑定一个工艺', fill: '在本页下拉为该工位选择启用工艺;工单执行路线由工单工艺组合决定' }, { name: '终端可见页签', source: '本页「页签」按钮配置(station.visibleTabs)。', purpose: '该工位终端允许显示哪些功能页签(上线建档/作业/物料/产线点位(上料/下料)/工艺文件/巡检/下线完工),按工位差异化界面', fill: '点「页签」勾选;全部不勾 = 显示全部页签,保存后终端下次拉取任务生效' }, - { name: '删除', source: '本页操作。', purpose: '删除自定义工位', fill: '仅自定义工位可删除;内置工位不允许删除' }, + { name: '删除', source: '本页操作。', purpose: '删除自定义工位', fill: '仅自定义工位可删除;内置工位不允许删除。注意:删除即退出工单工艺组合候选与终端工位下拉,历史报工记录保留但该工位不再可选;删除前确认无工单工艺组合引用' }, { name: '虚拟工位', source: '工位维护页手动创建(类型选「线下位」)。原系统预置的 0/13 虚拟上下线位已废弃,不再预置。', purpose: '不连 PLC、仅记录上下线的辅助工位', fill: '只读;上线建档/下线完工改由工位终端「页签」配置(station.visibleTabs)决定哪些工位可显示该面板,任意授权工位均可操作' } ] } @@ -212,7 +211,7 @@ export const helpSettings = { overview: '运行参数集中配置页,保存即生效(无需重启服务)。库存查询、缺料补货、可生产套数、排产支撑均为实时计算:库存实时来自 WMS,需求按「日排产 × 工单工艺组合」现场汇总,MES 不落库存/需求表,所以改配置立刻影响下一次计算。\n\n可配置项:\n· WMS 地址(IP:端口):保存后热切换,所有库存查询/扣账/台账同步即刻走新地址;「测试连通」只试测不保存,失败不影响当前配置。\n· 需求窗口天数:缺料补货/未来需求按日排产取未来 N 天(默认 5),WMS 备料四态「预警」数据源。\n· 外推均值窗口 / 外推封顶:排产支撑在排产日耗尽仍有余量时,按近 N 天平均日需求外推,封顶防死循环。\n· 事件日志保留天数:超过保留期的操作日志每小时自动清理,0=不清理。\n\n本机基础信息(只读):主机名/内网 IP、服务监听地址、数据库、当前生效 WMS 地址、Go 版本、启动时间。\n\n安全边界:JWT 密钥、WMS Token、数据库密码等敏感信息一律留在 etc/bj_power_mes-api.yaml,不进本页(不在库里明文存密)。', fields: [ - { name: 'WMS 地址', source: '手工填写(sys_config: wms.base_url),留空=用 YAML 配置/默认 127.0.0.1:9091。', purpose: '库存查询/扣账/半成品流转/台账同步的 WMS 服务地址,保存即热切换', fill: '如 http://192.168.1.100:9091;先用「测试连通」验证再保存' }, + { name: 'WMS 地址', source: '手工填写(sys_config: wms.base_url),留空=用 YAML 配置/默认 127.0.0.1:9091。', purpose: '库存查询/扣账/半成品流转/台账同步的 WMS 服务地址,保存即热切换', fill: '如 http://192.168.1.100:9091;先用「测试连通」验证再保存。注意:地址填错并保存后,库存查询/备料/完工回流会立即失败(WMS 不可达时物料档案降级本地只读),把地址改回即可恢复,不丢数据' }, { name: '需求窗口天数', source: '数字(sys_config: demand.days,默认 5)。', purpose: '缺料补货/未来需求 = 未来 N 天日排产 × 工单单台含损耗用量', fill: '1~60 天;改大可提前看到更远期备料需求' }, { name: '外推均值窗口', source: '数字(sys_config: producible.extrap.window,默认 3)。', purpose: '排产支撑外推取最近 N 天平均日需求', fill: '1~30 天' }, { name: '外推封顶', source: '数字(sys_config: producible.extrap.cap,默认 365)。', purpose: '排产支撑外推最多算 N 天,防死循环', fill: '30~3650 天' }, @@ -233,7 +232,7 @@ export const helpLineManagement = { { name: '绑定工位', source: '由接驳台编码派生(DOCKnn → 工位 (nn+1)/2),硬件级对应关系,不可编辑。', purpose: '该接驳台服务的产线工位号', fill: '产线类型自动展示;库房/其他不绑工位' }, { name: '启用状态', source: '启用 / 停用。', purpose: '停用后不出现在 AGV 派车等下拉中', fill: '行内「停用/启用」切换' }, { name: '占用状态', source: 'PLC 托盘传感器。', purpose: '当前是否有托盘', fill: '只读,不可人工维护' }, - { name: '工件位置纠正', source: '系统按 MES 记录 vs PLC 实际自动列出。', purpose: '把记录过期/错位的工件位置清为「不在工位」', fill: '行内「纠正」,二次确认后生效并记日志' }, + { name: '工件位置纠正', source: '系统按 MES 记录 vs PLC 实际自动列出。', purpose: '把记录过期/错位的工件位置清为「不在工位」', fill: '行内「纠正」,二次确认后生效并记日志。注意:纠正动作不可在本页撤销——误纠正(PLC 其实没读到)会把在制工件标成「不在工位」,需重新上线建档或人工核对后处理;纠正前先到「PLC管理」确认传感器读数正常' }, { name: '末端取件释放', source: '点位台账中 G11/G12 的占用记录(SN / 来源工单 / 占用时间)。', purpose: '人工确认末端工件已取走,释放点位占用', fill: '勾选记录 →「确认已取件」二次确认;无「产线管理」权限不可操作' } ] } @@ -241,11 +240,13 @@ export const helpLineManagement = { export const helpAgv = { title: 'AGV 配送', overview: - 'AGV(海康 RCS-Lite V1.5)配送管理:库房出库后由 AGV 将物料托盘送到产线接驳台。AGV 任务与 RCS 客户端的唯一真源在 MES(2026-10-14 自 WMS 迁入),本页合并「接驳台状态」「车辆状态(只读)」「AGV任务」与「手动派车 / 自由调度」。\n\n【三层安全机制(2026-11-03 拍板)】\n· ① 业务自动触发(免弹窗):仓库完成备料→系统自动派空车去装货点;卸货放行后自动派空车回充电位——这两段无需人工点确认。\n· ② 装卸强制确认(到位待令):AGV 到达目标接驳台后状态变「到位待令」,必须人工在「AGV任务」页或 WMS「叫料队列」点「确认装车并送货 / 卸货完成并放行」才走下一段。\n· ③ 传感器自动放行 + 人工兜底:接驳台有 PLC 托盘传感器,AGV 送达后系统按「传感器检测到托盘」自动放行(货已卸到位即放行,无需点按钮);传感器故障时由人工点「卸货完成并放行 / 人工强制放行」兜底。\n· ④ 自由调度(单点步进):每次点「开始搬运」必须弹「请确保路径畅通无杂物」才出发;到位停住待令,再选下一段或回充电位。\n\n【车辆状态页签】纯只读展示车辆闲忙/充电/电量/位置(海康 3.1.7);调度完全交给 RCS,本系统不干预(AGV 自己判定优先级与闲忙)。\n\n接驳台状态:有传感器,PLC 可反馈「是否有托盘」;AGV 到达目标口前系统可查询该口是否空闲,托盘未清走前不会再次下料到该口。\n\n说明:RCS-Lite 未对接时走模拟模式(mock)用于联调完整链路;现场配置 BaseURL(默认端口 8182)后自动切换真实调度,业务代码无需改动。', + 'AGV(海康 RCS-Lite V1.5)配送管理:库房出库后由 AGV 将物料托盘送到产线接驳台。AGV 任务与 RCS 客户端的唯一真源在 MES(2026-10-14 自 WMS 迁入),本页合并「接驳台状态」「车辆状态(只读)」「点位管理」「AGV任务」与「手动派车 / 自由调度 / 手动多段链」。\n\n【能做什么】查接驳台占用、查车辆闲忙/电量(只读)、刷新任务状态、手动派车补派、自由调度单点步进、把一台车连送多个节点(多段链:第一段不指定车由 RCS 自由派,之后锁同一台车连送,节点数不限,点「结束任务」收口)。\n\n【任务状态机】待下发 → 待搬运 → 搬运中 → 到位待令(ARRIVED) → 完成;到位待令是人工闸口:必须「确认装车并送货 / 卸货完成并放行」才走下一段(自由回充段 auto_end 除外)。\n\n【安全机制(按层)】\n· ① 业务自动触发(免弹窗):仓库完成备料→系统自动派空车去装货点;卸货放行后自动派空车回充电位——这两段无需人工点确认。\n· ② 装卸强制确认(到位待令):AGV 到达目标接驳台后必须人工确认才走下一段——接驳台上的托盘不一定属于本趟任务,可能属于其他工单、其他工位或上一趟遗留,传感器判断不了归属,人工确认是为了防错取。\n· ③ 传感器自动放行(双重确认,2026-11-06 加固):落点为产线接驳台的到位任务,刷新/回调时若该接驳台 PLC 传感器检测到托盘(货已卸到位)→ 自动卸货放行;但**送料(配送单驱动)任务还须关联配送单状态为「已送达」,两者都满足才放行;配送单未送达或 WMS 查询失败则不自动放行、转人工确认**(落预警 agv.auto_release_blocked 留痕)。托盘回收/自由调度无单据联动,仍按传感器判定;传感器故障时人工点「卸货完成并放行」兜底。\n· ④ 派车锁(点位占用锁):派车成功系统自动锁目标点位(锁定原因=任务号),任务终态自动释放;被锁点位再派车被拒「目标点位被占用,请稍后或联系库管」;库房接驳台 JBT21 的锁永不自动释放,只能库管在「点位管理」人工解锁。点位管理可人工锁定/解锁(留痕)。\n· ⑤ 强提标记:PLC/传感器离线时强提叫料,目标点位打「强提」风险标记并推预警;此后该点位派车必须勾选「强提风险已人工确认」二次确认才放行,派车成功自动清标。\n· ⑥ 防撞硬拒:AGV 载货且目标接驳台有托盘 → 硬拒;落点接驳台传感器检测到托盘 → 硬拒「存在碰撞风险」。\n· ⑦ RCS 幂等:派车以任务号作 RCS 请求号(reqCode),网络重试不会重复生成任务。\n\n【车辆状态页签】纯只读展示车辆闲忙/充电/电量/位置(海康 3.1.7);调度完全交给 RCS,本系统不干预。载货台账与 RCS 不一致时(RCS 上报载货而台账空载)以 RCS 为准回写并拒绝本次派车,需人工核实卸货。\n\n说明:RCS-Lite 未对接时走模拟模式(mock)用于联调完整链路;现场配置 BaseURL(默认端口 8182)后自动切换真实调度,业务代码无需改动。', fields: [ { name: '接驳台状态', source: '系统维护。产线接驳台按工位绑定 + 库房接驳台。', purpose: '查看每个接驳台当前是否有托盘', fill: '绿色=空闲(无托盘);橙色=有托盘(占用中,AGV 到达前需确认空闲);已停用接驳台置灰' }, - { name: 'AGV任务', source: '系统生成。每次派车一个目标口生成一条任务。', purpose: '追踪每批料的搬运进度', fill: '状态:待下发 → 待搬运 → 搬运中 → 已到位;「刷新状态」拉取 RCS 最新状态;未终态任务可取消' }, - { name: '手动派车', source: '默认列「已发货」叫料单(仓库已完成备料)。', purpose: '补派或对失败任务重试', fill: '勾选行 → 行内可改目标接驳台 → 选源点 → 派车;按目标口分组生成任务,操作人为当前登录账号' } + { name: '点位管理(派车锁)', source: '派车成功系统自动锁目标点位(锁定原因=任务号),任务终态自动释放;JBT21 仅人工解锁。', purpose: '防止对同一接驳台重复派车撞车;强提标记点位派车需二次确认', fill: '列表「派车锁」列显示 锁定中/空闲 与锁定原因;行内「锁定/解锁」填原因留痕;「清强提」清除强提风险标记(现场确认安全后操作)' }, + { name: 'AGV任务', source: '系统生成。每次派车一个目标口生成一条任务。', purpose: '追踪每批料的搬运进度', fill: '状态:待下发 → 待搬运 → 搬运中 → 已到位/到位待令;「刷新状态」拉取 RCS 最新状态并驱动传感器自动放行(见上③);未终态任务可取消' }, + { name: '手动派车', source: '默认列「已发货」叫料单(仓库已完成备料)。', purpose: '补派或对失败任务重试', fill: '勾选行 → 行内可改目标接驳台 → 选源点 → 派车;目标点位被派车锁占用或带强提标记时会被拦截,按提示确认后放行;按目标口分组生成任务,操作人为当前登录账号' }, + { name: '多段链(下一个节点/结束任务)', source: '手动连送场景:第一段派车不指定车,之后每加一个节点锁定同一台车。', purpose: '一台车按人工指定的顺序连送多个点位', fill: '任务详情里点「下一个节点」选目标(可无限加段);全部送完点「结束任务」——结束前系统查 RCS 车辆状态,查询失败默认拒绝,可勾选「人工确认无托盘」强制结束(留痕)' } ] } @@ -334,7 +335,7 @@ export const helpProcessFlow = { { name: '操作工签字确认', source: '每个工艺步骤开关。开启后该步骤要求「操作工签字」。', purpose: '签字机制第一签:操作工报工前须在本步骤签字确认,否则报工被拦截', fill: '在步骤行打开开关;报工时工位终端弹「签字确认」采集签字人,签字记录按「操作工」身份留痕' }, { name: '检验员签字确认', source: '每个工艺步骤开关。开启后该步骤要求「检验员签字」。', purpose: '签字机制第二签:该步骤须由检验员在巡检终端「待签任务」页签签字确认,流程方可放行', fill: '在步骤行打开开关;操作工签字后,检验员到【巡检终端-待签任务】逐行「签字确认」,签字记录按「检验员」身份留痕,需开通「巡检-签字确认」权限' }, { name: '步骤附件/图纸', source: '每个工艺步骤单独上传(绑定式)。文件由 MES 服务器保存。', purpose: '把图纸精确绑定到具体步骤,工位终端按当前步骤自动展示对应图纸', fill: '在步骤行上传该步骤图纸/附件(可多个);随步骤自动分发到工位终端' }, - { name: '物料清单', source: '本页维护:物料编码(下拉选择,取自物料档案)/名称/规格/单位/序列号/单台用量/损耗率%,整表覆盖保存。', purpose: '该工艺装配所需物料;备料需求 = 各工位分产量 × 单台用量 × (1+损耗率%)', fill: '物料编码取自物料档案编码(结构件通常即图号),选中后名称/规格/单位/序列号自动带出、不可改;序列号来自物料档案:序列号=是(录SN)/序列号=否(不录SN)' } + { name: '物料清单', source: '本页维护:物料编码(下拉选择,取自物料档案)/名称/规格/单位/序列号/单台用量/损耗率%,整表覆盖保存。', purpose: '该工艺装配所需物料;备料需求 = 各工位分产量 × 单台用量 × (1+损耗率%)', fill: '物料编码取自物料档案编码(结构件通常即图号),选中后名称/规格/单位/序列号自动带出、不可改;序列号来自物料档案:序列号=是(录SN)/序列号=否(不录SN)。注意:保存=整表覆盖,被删行不保留且不可恢复;已据旧清单备料/出库的工单不受追溯影响,但下次备料按新清单算' } ] }, { @@ -509,7 +510,7 @@ export const helpProductProcess = { export const helpQuality = { title: '质量检验(过程检 / 完工检)', overview: - '质量检验 = 对物料/产品做检验判定并留痕,分「过程检」与「完工检」两个 Tab(本页仅只读查看,录入已收口至 PAD 巡检终端)。来料检在 WMS 库房侧完成,本页不重复。\n\n核心口径:完工确认=生产完成;完工检合格后成品自动入 WMS 库(已通过→合格,部分通过→合格,不合格→不入库待返修)。完工检页签顶部「待完工检成品」列出完工确认后尚未录完工检的成品 SN(产品工号/产品序号/SN/完工时间,只读分页),检验员逐台录入完工检即可。\n\n录入(已收口至 PAD 巡检终端):过程检/完工检的录入统一在 PAD 巡检终端完成——质检员在「巡检终端-完工检」页签从「待完工检成品」清单选 SN,填试验记录单号/相关标准并判定结论后保存,合格自动回流入 WMS 库(若该成品已在库 WMS 会防重拦截并提示「已入库勿重复」)。本页(质量检验)为只读追溯:仅可查询、查看已录记录、对不合格记录做处置、下载不合格单,不提供新增录入。\n\n不合格闭环:结论为「不合格」时可当场选择处置方式(退货/返修/退换)并写处置说明;也可在列表操作列「处置」补录,或点「不合格单」一键导出《不合格单.xlsx》(预填本次检验数据)。\n\n查询:图号 / 物料名称 / 报检单号 / 记录日期范围组合筛选,每个框内模糊匹配、多框取交集;记录按时间倒序,后端真分页。', + '质量检验 = 对物料/产品做检验判定并留痕,分「过程检」与「完工检」两个 Tab(本页仅只读查看,录入已收口至 PAD 巡检终端)。来料检在 WMS 库房侧完成,本页不重复。\n\n核心口径:完工确认=生产完成;完工检合格后成品自动入 WMS 库(已通过→合格,部分通过→合格,不合格→不入库待返修)。完工检页签顶部「待完工检成品」列出完工确认后尚未录完工检的成品 SN(产品工号/图号/SN/完工时间,只读分页),检验员逐台录入完工检即可。\n\n录入(已收口至 PAD 巡检终端):过程检/完工检的录入统一在 PAD 巡检终端完成——质检员在「巡检终端-完工检」页签从「待完工检成品」清单选 SN,填试验记录单号/相关标准并判定结论后保存,合格自动回流入 WMS 库(若该成品已在库 WMS 会防重拦截并提示「已入库勿重复」)。本页(质量检验)为只读追溯:仅可查询、查看已录记录、对不合格记录做处置、下载不合格单,不提供新增录入。\n\n不合格闭环:结论为「不合格」时可当场选择处置方式(退货/返修/退换)并写处置说明;也可在列表操作列「处置」补录,或点「不合格单」一键导出《不合格单.xlsx》(预填本次检验数据)。\n\n查询:图号 / 物料名称 / 报检单号 / 记录日期范围组合筛选,每个框内模糊匹配、多框取交集;记录按时间倒序,后端真分页。', fields: [ { name: '图号', source: '远程检索 WMS 物料档案(/materials 代理接口,WMS 是物料主数据源),也可手填。', purpose: '被检物料的图号(即 WMS 物料档案的图号)', fill: '输入图号或名称关键字选择' }, { name: '物料名称', source: '选图号后自动带出,可手改。', purpose: '被检物料名称', fill: '一般无需手填' }, diff --git a/bj_power_mes/frontend/src/pages/Agv.vue b/bj_power_mes/frontend/src/pages/Agv.vue index f9621fa..7ad478b 100644 --- a/bj_power_mes/frontend/src/pages/Agv.vue +++ b/bj_power_mes/frontend/src/pages/Agv.vue @@ -95,7 +95,7 @@ const statusOptions = [ const statusText = (s) => (statusOptions.find((x) => x.v === s) || {}).l || '—' const statusTag = (s) => s === '9' ? 'success' : s === 'ARRIVED' ? 'danger' : s === 'FAILED' || s === '5' ? 'info' : s === '2' ? 'warning' : s === '1' ? 'primary' : '' -const kindText = (k) => ({ GO_LOAD: '空车去程', TRANSPORT: '重载运输', EMPTY_RETURN: '空车回充', FREE: '自由调度' }[k] || '—') +const kindText = (k) => ({ GO_LOAD: '空车去程', TRANSPORT: '重载运输', EMPTY_RETURN: '空车回充', FREE: '自由调度', MANUAL: '手动节点' }[k] || '—') /* ===================== 到位待令确认(2026-11-03 三层安全机制) ===================== */ // 到位即停:GO_LOAD 段→「确认装车并送货」;TRANSPORT 段→「卸货完成并放行」(放行后空车自动回充); @@ -114,10 +114,10 @@ async function confirmLoadGo(row) { inputValue: def, inputPlaceholder: '如 DOCK03 或 AGV-WAIT01', type: 'warning', inputValidator: (v) => !!v || '目标必填' }) - await confirmAgv(row, 'load_go', (value || '').trim()) + await confirmAgv(row, 'load_go', (value || '').trim(), await confirmForcePickTargets([(value || '').trim()])) } catch { /* 取消 */ } } -async function confirmAgv(row, action, nextDock) { +async function confirmAgv(row, action, nextDock, confirmForcePick) { const tips = { load_go: '确认已装车并送货?AGV 将背着托盘前往目标接驳台。', unload_release: '确认卸货完成并放行?托盘将落位当前接驳台,AGV 空车自动回充电位。', @@ -133,7 +133,7 @@ async function confirmAgv(row, action, nextDock) { } catch { return } confirmBusy.value = true try { - await request.post('/agv/confirm', { taskNo: row.taskNo, action, nextDock: nextDock || '' }) + await request.post('/agv/confirm', { taskNo: row.taskNo, action, nextDock: nextDock || '', confirmForcePick: confirmForcePick === null ? '' : (confirmForcePick || '') }) ElMessage.success('已确认') loadTasks() } catch (e) { @@ -142,12 +142,14 @@ async function confirmAgv(row, action, nextDock) { } async function freeDispatch(target) { if (!target) { ElMessage.warning('请选择目标点位'); return } + const forceOk = await confirmForcePickTargets([target]) + if (forceOk === null) return try { await ElMessageBox.confirm('请确保路径畅通无杂物,确认后 AGV 出发前往 ' + (pointLabel(target) || target) + '。', '开始 AGV 搬运', { type: 'warning' }) } catch { return } confirmBusy.value = true try { - await request.post('/agv/free-dispatch', { target, source: freeSource.value || '' }) + await request.post('/agv/free-dispatch', { target, source: freeSource.value || '', confirmForcePick: forceOk }) ElMessage.success('已派车') loadTasks() } catch (e) { @@ -237,9 +239,12 @@ async function submitAgv() { } catch { return } } const lines = groupPreview.value.map((g) => `· ${g.dock}:${g.n} 行`).join('\n') + // 强提风险点位人工二次确认(2026-11-06 拍板) + const forceOk = await confirmForcePickTargets(rows.map((r) => r.targetDock)) + if (forceOk === null) return try { await ElMessageBox.confirm( - `确认对 ${rows.length} 行叫料单手动派车?\n\n按目标点位分组:\n${lines}\n\n源点:${pointLabel(sourceDock.value)}\n操作人:${operator.value}\n\n注:仓库完成备料时系统已自动派车,本操作用于补派或对失败任务重试。`, + `确认对 ${rows.length} 行手动派车?\n\n按目标点位分组:\n${lines}\n\n源点:${pointLabel(sourceDock.value)}\n操作人:${operator.value}\n\n注:第一段由 RCS 自动派车;AGV 到位后在下方「任务进行中」面板点「下一个节点」(全程同一台车)逐段推进,全部送完点「结束任务」。`, '手动派车确认', { type: 'warning', confirmButtonText: '确认派车', cancelButtonText: '取消' } ) @@ -249,11 +254,11 @@ async function submitAgv() { { rows: rows.map((r) => ({ requestNo: r.requestNo, materialCode: r.materialCode, materialName: r.materialName, unit: r.unit, qty: Number(r.reqQty || 0), targetDock: r.targetDock - })), sourceDock: sourceDock.value }, + })), sourceDock: sourceDock.value, confirmForcePick: forceOk }, withOperator()) - ElMessage.success(`已创建 ${res?.created || 0} 个 AGV 任务`) + ElMessage.success(`已创建 ${res?.created || 0} 个手动多段任务,请在下方「任务进行中」面板逐节点推进`) selected.value = [] - loadMrs(); loadTasks(); loadDocks() + loadMrs(); loadTasks(); loadDocks(); loadChains() } catch { /* 拦截器已提示 */ } } @@ -324,7 +329,7 @@ async function loadMode() { } catch { /* 忽略 */ } } -onMounted(() => { loadDocks(); loadTasks(); loadMode(); loadAgvPoints(); loadVehicles(); loadVehicleStates() }) +onMounted(() => { loadDocks(); loadTasks(); loadMode(); loadAgvPoints(); loadVehicles(); loadVehicleStates(); loadChains() }) // 车辆状态只读(海康 3.1.7,2026-11-03 拍板:纯只读展示,不干预调度) const vehicles = ref([]) @@ -380,14 +385,136 @@ async function addManualState(hasPallet) { } const stateSourceCn = (s) => ({ AUTO_LOAD: '取货确认', AUTO_UNLOAD: '卸货确认', MANUAL: '人工维护' }[s] || s) +/* ===================== 点位锁定管理(派车锁 2026-11-06 拍板) ===================== */ +// system 锁=派车自动置/任务终态自动释放(JBT21 例外手动解锁);manual 锁=人工锁定仅人工解锁; +// 强提标记=PLC 离线强提叫料点位,派车需人工二次确认,确认现场安全后可在此清除。 +async function lockPoint(p, locked) { + let reason = '' + if (locked) { + try { + const r = await ElMessageBox.prompt('锁定后该点位拒绝一切派车(含自动派车),直至人工解锁。请填写锁定原因:', '人工锁定点位 ' + p.positionCode, { + type: 'warning', confirmButtonText: '确认锁定', cancelButtonText: '取消', + inputPlaceholder: '锁定原因(必填)', inputValidator: (v) => !!v || '原因必填' + }) + reason = r.value || '' + } catch { return } + } else { + try { + await ElMessageBox.confirm(`确认解锁点位 ${p.positionCode}?解锁后恢复接受派车。`, '人工解锁点位', { type: 'warning' }) + } catch { return } + } + try { + await request.post(`/agv/points/${p.id}/lock`, locked ? { locked: true, reason } : { unlock: true }, withOperator()) + ElMessage.success(locked ? '已锁定' : '已解锁') + loadAgvPoints() + } catch { /* 拦截器已提示 */ } +} +async function clearPointForcePick(p) { + try { + await ElMessageBox.confirm(`确认清除 ${p.positionCode} 的强提风险标记?请确认现场安全。`, '清除强提标记', { type: 'warning' }) + } catch { return } + try { + await request.post(`/agv/points/${p.id}/lock`, { clearForcePick: true }, withOperator()) + ElMessage.success('已清除强提标记') + loadAgvPoints() + } catch { /* 拦截器已提示 */ } +} + +// 强提风险点位人工二次确认:目标带标记时先弹确认,确认后请求带 confirmForcePick="1" 下发 +async function confirmForcePickTargets(codes) { + const hits = [...new Set(codes)].filter((c) => pointMap.value[c] && pointMap.value[c].forcePick) + if (!hits.length) return '' + const names = hits.map((c) => pointLabel(c)).join('、') + try { + await ElMessageBox.confirm( + `目标点位 ${names} 带强提风险标记(PLC 离线期间强行提交过叫料)。请确认现场安全(无人员/障碍/托盘异常)后继续。`, + '强提风险二次确认', { type: 'warning', confirmButtonText: '确认现场安全,继续', cancelButtonText: '取消' } + ) + return '1' + } catch { return null } +} + +/* ===================== 手动多段链(任务进行中面板,2026-11-06 拍板) ===================== */ +// 流程:第一段 RCS 自由派车 → 到位点「刷新状态」拿到分车结果 → 用户逐节点「下一个节点」 +//(全程锁同一台车,段数不确定,目标由用户自选)→ 全部送完点「结束任务」(校验车无托盘)。 +const chains = ref([]) +const loadingChains = ref(false) +const chainBusy = ref(false) +async function loadChains() { + loadingChains.value = true + try { + const d = await request.get('/agv/chain/list') + chains.value = d?.list || [] + } catch { chains.value = [] } + loadingChains.value = false +} +// 先轮询 RCS 回写 agvCode/到位状态,再取链列表(到位/分车都靠这次刷新落库) +async function refreshChains() { + chainBusy.value = true + try { await request.post('/agv/refresh', {}, withOperator()) } catch { /* 忽略 */ } + await loadChains(); loadTasks(); loadDocks() + chainBusy.value = false +} +// 链内当前节点=最新非终态段 +function chainCurrent(c) { + const segs = c.segments || [] + for (let i = segs.length - 1; i >= 0; i--) { + if (segs[i].status !== '9' && segs[i].status !== '5') return segs[i] + } + return null +} +const chainSegText = (seg) => `${pointLabel(seg.sourceDock)} → ${pointLabel(seg.targetDock)}` +// 下一节点弹窗(用户自选下一段去哪;起点可空=沿用上一节点落点) +const nextNode = reactive({ visible: false, chainNo: '', source: '', target: '' }) +function openNextNode(c) { + nextNode.chainNo = c.chainNo + nextNode.source = '' + nextNode.target = '' + nextNode.visible = true +} +async function submitNextNode() { + if (!nextNode.target) return ElMessage.warning('请选择下一节点目标点位') + const forceOk = await confirmForcePickTargets([nextNode.target]) + if (forceOk === null) return + chainBusy.value = true + try { + await request.post('/agv/chain/next', + { chainNo: nextNode.chainNo, source: nextNode.source || '', target: nextNode.target, confirmForcePick: forceOk }, + withOperator()) + ElMessage.success('下一节点已下发(同一台 AGV 继续执行)') + nextNode.visible = false + await loadChains(); loadTasks(); loadDocks() + } catch { /* 拦截器已提示 */ } + chainBusy.value = false +} +// 结束任务弹窗:勾选「人工确认无托盘」可在 RCS 状态查询失败时强制结束(后端留痕) +const endDialog = reactive({ visible: false, chainNo: '', agvCode: '', force: false }) +function openEndChain(c) { + endDialog.chainNo = c.chainNo + endDialog.agvCode = c.agvCode || '' + endDialog.force = false + endDialog.visible = true +} +async function submitEndChain() { + chainBusy.value = true + try { + await request.post('/agv/chain/end', { chainNo: endDialog.chainNo, force: endDialog.force }, withOperator()) + ElMessage.success('任务已结束,AGV 空车自动回充') + endDialog.visible = false + await loadChains(); loadTasks(); loadDocks() + } catch { /* 拦截器已提示 */ } + chainBusy.value = false +} + // 切 tab 重新加载对应数据(2026-10-19:lazy 页签切回不 reload,状态/叫料单会停留在旧数据) function onTabChange(name) { if (name === 'docks') loadDocks() else if (name === 'tasks') loadTasks() - else if (name === 'dispatch') loadMrs() + else if (name === 'dispatch') { loadMrs(); loadChains() } else if (name === 'points') loadAgvPoints() else if (name === 'vehicles') { loadVehicles(); loadVehicleStates() } } + + + + + + + + + + - + @@ -681,4 +890,14 @@ function onTabChange(name) { .veh-meta { font-size: 12px; color: #909399; margin-top: 6px; } .mono { font-family: Consolas, Monaco, monospace; } .disabled-text { color: #909399; } +.chain-title { font-weight: 700; font-size: 14px; } +.chain-card { border: 1px solid #e4e7ed; border-radius: 8px; padding: 12px 14px; margin-bottom: 10px; } +.chain-head { display: flex; align-items: center; gap: 10px; margin-bottom: 8px; } +.chain-no { font-family: Consolas, Monaco, monospace; font-weight: 600; } +.chain-agv { margin-left: auto; font-size: 13px; } +.chain-agv b { color: #409eff; } +.chain-agv b.agv-unknown { color: #909399; font-weight: 400; } +.chain-segs { display: flex; flex-direction: column; gap: 4px; margin-bottom: 8px; } +.chain-seg { font-size: 13px; display: flex; align-items: center; gap: 6px; } +.chain-ops { display: flex; align-items: center; gap: 8px; border-top: 1px dashed #ebeef5; padding-top: 8px; } diff --git a/bj_power_mes/frontend/src/pages/DailyPlan.vue b/bj_power_mes/frontend/src/pages/DailyPlan.vue index 7c6070d..32a0bf9 100644 --- a/bj_power_mes/frontend/src/pages/DailyPlan.vue +++ b/bj_power_mes/frontend/src/pages/DailyPlan.vue @@ -193,7 +193,7 @@ - + diff --git a/bj_power_mes/frontend/src/pages/Inspect.vue b/bj_power_mes/frontend/src/pages/Inspect.vue index d35144a..afbe7cd 100644 --- a/bj_power_mes/frontend/src/pages/Inspect.vue +++ b/bj_power_mes/frontend/src/pages/Inspect.vue @@ -159,7 +159,7 @@ - + diff --git a/bj_power_mes/frontend/src/pages/ProcessCard.vue b/bj_power_mes/frontend/src/pages/ProcessCard.vue index cee0247..c0ffaab 100644 --- a/bj_power_mes/frontend/src/pages/ProcessCard.vue +++ b/bj_power_mes/frontend/src/pages/ProcessCard.vue @@ -30,7 +30,6 @@ - diff --git a/bj_power_mes/frontend/src/pages/ProductProcess.vue b/bj_power_mes/frontend/src/pages/ProductProcess.vue index 6cb8d32..7ad80db 100644 --- a/bj_power_mes/frontend/src/pages/ProductProcess.vue +++ b/bj_power_mes/frontend/src/pages/ProductProcess.vue @@ -5,7 +5,7 @@ title="产品工艺 = 某产品的加工工序顺序(第1道、第2道…)。新建工单选产品型号后,系统按这里的工序顺序,自动为每道工序推荐一个工位:后道工位号必须大于前道(工件在产线上单向流转、不回头),每道可改,改后后续候选自动更新。本页同时可打印路线卡给车间使用。" /> - + @@ -36,7 +36,7 @@ - + - + diff --git a/bj_power_wms/frontend/src/pages/Inbound.vue b/bj_power_wms/frontend/src/pages/Inbound.vue index fb15173..3809b4b 100644 --- a/bj_power_wms/frontend/src/pages/Inbound.vue +++ b/bj_power_wms/frontend/src/pages/Inbound.vue @@ -44,12 +44,28 @@ function onExceed(files, which) { async function importExcel(mode, which) { const raw = pickRaw(which) if (!raw) { ElMessage.warning('请先选择 .xlsx 文件'); return } - const fd = new FormData() - fd.append('file', raw) - fd.append('mode', mode) importing.value = true excelResult.value = null try { + // 阶段1 预检(只读,不写任何数据):与写入端点同一套校验规则 + const pfd = new FormData() + pfd.append('file', raw) + pfd.append('mode', mode) + const p = (await request.post('/inbound/batch-excel/preview', pfd)) || {} + const perrs = p.errors || [] + if (perrs.length) { + const lines = perrs.slice(0, 10).map((x) => `第${x.row}行 ${x.materialCode || ''}:${x.message}`).join(';') + ElMessage.error(`预检未通过:共 ${p.total || 0} 行,失败 ${perrs.length} 行(未写入任何数据):` + lines + (perrs.length > 10 ? ' …' : '')) + return + } + // 阶段2 确认 + await ElMessageBox.confirm( + `预检通过:共 ${p.total || 0} 行,将全部成功入库 ${p.success || 0} 行。正式写入为整批事务(全成功或全失败)。`, + '预检通过,确认导入', { type: 'info', confirmButtonText: '正式导入', cancelButtonText: '取消' }) + // 阶段3 正式写入 + const fd = new FormData() + fd.append('file', raw) + fd.append('mode', mode) const data = await request.post('/inbound/batch-excel', fd) excelResult.value = data || {} if (data?.failed > 0) { @@ -58,6 +74,9 @@ async function importExcel(mode, which) { ElMessage.success(`批量导入成功:共 ${data?.success ?? 0} 行`) await loadRecords() } + } catch (err) { + if (err === 'cancel' || err === 'close') return // 用户取消确认弹窗 + ElMessage.error('导入失败:网络异常或登录已过期,请重试') } finally { importing.value = false } diff --git a/bj_power_wms/internal/config/config.go b/bj_power_wms/internal/config/config.go index 95bf340..63a6c22 100644 --- a/bj_power_wms/internal/config/config.go +++ b/bj_power_wms/internal/config/config.go @@ -73,7 +73,6 @@ type Config struct { Postgres PostgresConfig Auth AuthConfig Internal InternalConfig - Redis RedisConf Mes MesConfig Web WebConfig Attachment AttachmentConfig @@ -81,12 +80,6 @@ type Config struct { Scanner ScannerConfig } -// RedisConf Redis 连接配置 -type RedisConf struct { - Host string `json:",default=127.0.0.1:6379"` - Type string `json:",default=node"` -} - // DSN 返回 PostgreSQL 连接串 func (p PostgresConfig) DSN() string { return "host=" + p.Host + diff --git a/bj_power_wms/internal/db/db.go b/bj_power_wms/internal/db/db.go index e0d909c..df4b524 100644 --- a/bj_power_wms/internal/db/db.go +++ b/bj_power_wms/internal/db/db.go @@ -5,6 +5,7 @@ import ( "database/sql" "fmt" "log/slog" + "strings" "bj_power_wms/ent" @@ -44,6 +45,43 @@ func NewDB(c DatabaseConf) (*ent.Client, error) { return ent.NewClient(ent.Driver(drv)), nil } +// CheckSchema 启动期只读结构校验(2026-11-06 拍板:启动禁止改库): +// 核心表缺失直接报错并提示先执行 migrate 命令;本函数只查 information_schema,绝不做任何 DDL。 +// 列级缺失不在启动期逐一枚举(随首个命中的业务查询以 42703 报错兜底,处理口径同:先 migrate)。 +func CheckSchema(c DatabaseConf) error { + dsn := fmt.Sprintf("postgresql://%s:%s@%s:%d/%s?sslmode=disable", + c.User, c.Password, c.Host, c.Port, c.Dbname, + ) + sqlDB, err := sql.Open("pgx", dsn) + if err != nil { + return err + } + defer sqlDB.Close() + required := []string{ + "users", "roles", "permissions", // 权限/账号 + "materials", "inventories", // 主数据/库存 + "inbound_orders", "outbound_orders", // 出入库 + "delivery_order", // 配送单 + "sys_config", // 基础设置 + } + missing := []string{} + for _, t := range required { + var exists bool + if err := sqlDB.QueryRow( + `SELECT EXISTS(SELECT 1 FROM information_schema.tables WHERE table_schema = current_schema() AND table_name = $1)`, t, + ).Scan(&exists); err != nil { + return fmt.Errorf("检查表 %s 失败: %w", t, err) + } + if !exists { + missing = append(missing, t) + } + } + if len(missing) > 0 { + return fmt.Errorf("数据库结构未初始化或缺表(%s);启动已禁止自动建表/补列,请先手工执行迁移命令:bj_power_wms migrate", strings.Join(missing, ", ")) + } + return nil +} + // EnsureDB 若目标数据库不存在则自动创建(先连 postgres 维护库做检查/创建) func EnsureDB(c DatabaseConf) error { maintenanceDSN := fmt.Sprintf("postgresql://%s:%s@%s:%d/%s?sslmode=disable", diff --git a/bj_power_wms/internal/handler/delivery.go b/bj_power_wms/internal/handler/delivery.go index 8b1c39f..3761245 100644 --- a/bj_power_wms/internal/handler/delivery.go +++ b/bj_power_wms/internal/handler/delivery.go @@ -415,6 +415,25 @@ func deliveryDeliveredInternalHandler(ctx *svc.ServiceContext) http.HandlerFunc } } +// deliveryStatusInternalHandler GET /api/internal/delivery/status?no=(MES 到位自动放行双重确认查询) +// 返回配送单当前状态(PENDING/DISPATCHED/DONE/CANCELLED);单不存在返回空串(兼容旧叫料单直派链路)。 +func deliveryStatusInternalHandler(ctx *svc.ServiceContext) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + no := r.URL.Query().Get("no") + if no == "" { + fail(w, http.StatusBadRequest, "缺少配送单号") + return + } + o, err := ctx.EntClient.DeliveryOrder.Query(). + Where(deliveryorder.DeliveryNoEQ(no)).First(r.Context()) + if err != nil || o == nil { + ok(w, map[string]any{"status": ""}) // 旧链路 BizNo=叫料单号:无配送单,空状态 + return + } + ok(w, map[string]any{"status": o.Status}) + } +} + // callCreateProxyHandler POST /api/call/create WMS 代叫料(与工位终端同一套逻辑) func callCreateProxyHandler(ctx *svc.ServiceContext) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { diff --git a/bj_power_wms/internal/handler/excel.go b/bj_power_wms/internal/handler/excel.go index f90848d..5d919e5 100644 --- a/bj_power_wms/internal/handler/excel.go +++ b/bj_power_wms/internal/handler/excel.go @@ -304,128 +304,8 @@ func excelInboundHandler(ctx *svc.ServiceContext) http.HandlerFunc { return } - type planRow struct { - row int - code string - sn string - qty int - prodDate string - supplier string - zone string - remark string - shelfNo string - layerNo string - positionNo string - inspectionNo string - productWorkNo string - ownershipType string - ownershipNo string - } - plans := make([]planRow, 0, len(rows)-1) - errs := make([]importErr, 0) - - // ---- 阶段1:解析 + 校验(不落库) ---- - snSeen := map[string]bool{} - for i, row := range rows { - if i == 0 { - continue // 表头 - } - cell := func(idx int) string { - if idx < len(row) { - return strings.TrimSpace(row[idx]) - } - return "" - } - pr := planRow{row: i + 1} - pr.code = cell(0) - if mode == "sn" { - // 图号|SN|区域|生产日期|供应商|架|层|位|备注|检测单号|产品工号|归属类型|归属编号 - pr.sn = cell(1) - pr.zone = cell(2) - pr.prodDate = cell(3) - pr.supplier = cell(4) - pr.shelfNo = cell(5) - pr.layerNo = cell(6) - pr.positionNo = cell(7) - pr.remark = cell(8) - pr.inspectionNo = cell(9) - pr.productWorkNo = cell(10) - pr.ownershipType = cell(11) - pr.ownershipNo = cell(12) - } else { - // 图号|数量|生产日期|供应商|区域|架|层|位|备注|检测单号|产品工号|归属类型|归属编号(批次号由系统自动生成,模板不再含该列) - pr.qty = atoi(cell(1), 0) - pr.prodDate = cell(2) - pr.supplier = cell(3) - pr.zone = cell(4) - pr.shelfNo = cell(5) - pr.layerNo = cell(6) - pr.positionNo = cell(7) - pr.remark = cell(8) - pr.inspectionNo = cell(9) - pr.productWorkNo = cell(10) - pr.ownershipType = cell(11) - pr.ownershipNo = cell(12) - } - - if pr.code == "" { - errs = append(errs, importErr{pr.row, pr.code, "图号为空"}) - continue - } - m, e := ctx.EntClient.Material.Query().Where(material.CodeEQ(pr.code)).Only(ctx0()) - if e != nil { - errs = append(errs, importErr{pr.row, pr.code, "物料不存在"}) - continue - } - if mode == "sn" { - if m.SnMode != snModeSN { - errs = append(errs, importErr{pr.row, pr.code, "该物料序列号=否(按数量管理),SN 导入仅支持序列号=是(逐件SN)"}) - continue - } - if pr.sn == "" { - errs = append(errs, importErr{pr.row, pr.code, "SN 为空"}) - continue - } - if snSeen[pr.sn] { - errs = append(errs, importErr{pr.row, pr.code, "SN 在文件中重复: " + pr.sn}) - continue - } - snSeen[pr.sn] = true - exists, _ := ctx.EntClient.Inventory.Query(). - Where(inventory.SnModeEQ(snModeSN), inventory.SnCodeEQ(pr.sn)).Exist(ctx0()) - if exists { - errs = append(errs, importErr{pr.row, pr.code, "SN 已存在: " + pr.sn}) - continue - } - } else { - if m.SnMode != snModeBatch { - errs = append(errs, importErr{pr.row, pr.code, "该物料序列号=是(逐件SN管理),请使用 SN 导入"}) - continue - } - if pr.qty <= 0 { - errs = append(errs, importErr{pr.row, pr.code, "数量必须大于 0"}) - continue - } - } - if pr.zone == "" { - errs = append(errs, importErr{pr.row, pr.code, "区域为空(必填)"}) - continue - } - // 货位必填(货架/层/位置):与手动录入(InboundEntry)口径一致,杜绝"有区域无货架"脏数据;任一为空则整批拒绝 - if pr.shelfNo == "" || pr.layerNo == "" || pr.positionNo == "" { - errs = append(errs, importErr{pr.row, pr.code, "货位不完整(货架/层/位置均为必填)"}) - continue - } - // 归属校验(与手动录入口径一致:workorder/project 必填编号;other/空 不需要) - pr.ownershipType = ownershipTypeOrNone(pr.ownershipType) - if pr.ownershipType == "workorder" || pr.ownershipType == "project" { - if pr.ownershipNo == "" { - errs = append(errs, importErr{pr.row, pr.code, "归属类型为" + pr.ownershipType + "时归属编号必填"}) - continue - } - } - plans = append(plans, pr) - } + // ---- 阶段1:解析 + 校验(不落库)——与预检端点 excelInboundPreviewHandler 共用同一函数,规则同源 ---- + plans, errs, _ := parseInboundImportPlan(ctx, rows, mode) // ---- 阶段2:有错则整体拒绝,一行都不写 ---- if len(errs) > 0 { @@ -569,6 +449,180 @@ func excelInboundHandler(ctx *svc.ServiceContext) http.HandlerFunc { } } +// inboundImportPlan 入库导入单行写入计划(预检与写入共用同一解析/校验,规则同源不漂移)。 +type inboundImportPlan struct { + row int + code string + sn string + qty int + prodDate string + supplier string + zone string + remark string + shelfNo string + layerNo string + positionNo string + inspectionNo string + productWorkNo string + ownershipType string + ownershipNo string +} + +// parseInboundImportPlan 入库导入阶段1:解析 + 逐行校验(只读不落库): +// 物料存在/数量>0/SN 不重复/区域与货位必填/归属编号规则。返回行计划、逐行错误与总数据行数。 +func parseInboundImportPlan(ctx *svc.ServiceContext, rows [][]string, mode string) ([]inboundImportPlan, []importErr, int) { + total := len(rows) - 1 + plans := make([]inboundImportPlan, 0, total) + errs := make([]importErr, 0) + + snSeen := map[string]bool{} + for i, row := range rows { + if i == 0 { + continue // 表头 + } + cell := func(idx int) string { + if idx < len(row) { + return strings.TrimSpace(row[idx]) + } + return "" + } + pr := inboundImportPlan{row: i + 1} + pr.code = cell(0) + if mode == "sn" { + // 图号|SN|区域|生产日期|供应商|架|层|位|备注|检测单号|产品工号|归属类型|归属编号 + pr.sn = cell(1) + pr.zone = cell(2) + pr.prodDate = cell(3) + pr.supplier = cell(4) + pr.shelfNo = cell(5) + pr.layerNo = cell(6) + pr.positionNo = cell(7) + pr.remark = cell(8) + pr.inspectionNo = cell(9) + pr.productWorkNo = cell(10) + pr.ownershipType = cell(11) + pr.ownershipNo = cell(12) + } else { + // 图号|数量|生产日期|供应商|区域|架|层|位|备注|检测单号|产品工号|归属类型|归属编号(批次号由系统自动生成,模板不再含该列) + pr.qty = atoi(cell(1), 0) + pr.prodDate = cell(2) + pr.supplier = cell(3) + pr.zone = cell(4) + pr.shelfNo = cell(5) + pr.layerNo = cell(6) + pr.positionNo = cell(7) + pr.remark = cell(8) + pr.inspectionNo = cell(9) + pr.productWorkNo = cell(10) + pr.ownershipType = cell(11) + pr.ownershipNo = cell(12) + } + + if pr.code == "" { + errs = append(errs, importErr{pr.row, pr.code, "图号为空"}) + continue + } + m, e := ctx.EntClient.Material.Query().Where(material.CodeEQ(pr.code)).Only(ctx0()) + if e != nil { + errs = append(errs, importErr{pr.row, pr.code, "物料不存在"}) + continue + } + if mode == "sn" { + if m.SnMode != snModeSN { + errs = append(errs, importErr{pr.row, pr.code, "该物料序列号=否(按数量管理),SN 导入仅支持序列号=是(逐件SN)"}) + continue + } + if pr.sn == "" { + errs = append(errs, importErr{pr.row, pr.code, "SN 为空"}) + continue + } + if snSeen[pr.sn] { + errs = append(errs, importErr{pr.row, pr.code, "SN 在文件中重复: " + pr.sn}) + continue + } + snSeen[pr.sn] = true + exists, _ := ctx.EntClient.Inventory.Query(). + Where(inventory.SnModeEQ(snModeSN), inventory.SnCodeEQ(pr.sn)).Exist(ctx0()) + if exists { + errs = append(errs, importErr{pr.row, pr.code, "SN 已存在: " + pr.sn}) + continue + } + } else { + if m.SnMode != snModeBatch { + errs = append(errs, importErr{pr.row, pr.code, "该物料序列号=是(逐件SN管理),请使用 SN 导入"}) + continue + } + if pr.qty <= 0 { + errs = append(errs, importErr{pr.row, pr.code, "数量必须大于 0"}) + continue + } + } + if pr.zone == "" { + errs = append(errs, importErr{pr.row, pr.code, "区域为空(必填)"}) + continue + } + // 货位必填(货架/层/位置):与手动录入(InboundEntry)口径一致,杜绝"有区域无货架"脏数据;任一为空则整批拒绝 + if pr.shelfNo == "" || pr.layerNo == "" || pr.positionNo == "" { + errs = append(errs, importErr{pr.row, pr.code, "货位不完整(货架/层/位置均为必填)"}) + continue + } + // 归属校验(与手动录入口径一致:workorder/project 必填编号;other/空 不需要) + pr.ownershipType = ownershipTypeOrNone(pr.ownershipType) + if pr.ownershipType == "workorder" || pr.ownershipType == "project" { + if pr.ownershipNo == "" { + errs = append(errs, importErr{pr.row, pr.code, "归属类型为" + pr.ownershipType + "时归属编号必填"}) + continue + } + } + plans = append(plans, pr) + } + return plans, errs, total +} + +// excelInboundPreviewHandler POST /api/inbound/batch-excel/preview 入库导入预检(只读): +// 复用写入端点的阶段1校验(parseInboundImportPlan,同一函数保证规则同源),不写任何数据。 +// 返回 {total 总行数, success 将成功行数, failed 失败行数, errors 逐行失败原因(行号+图号+原因)}。 +func excelInboundPreviewHandler(ctx *svc.ServiceContext) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + if err := r.ParseMultipartForm(20 << 20); err != nil { + fail(w, http.StatusBadRequest, "文件上传失败: "+err.Error()) + return + } + mode := r.FormValue("mode") + if mode != "sn" { + mode = "batch" + } + f, _, err := r.FormFile("file") + if err != nil { + fail(w, http.StatusBadRequest, "缺少 file 字段") + return + } + defer f.Close() + + xl, err := excelize.OpenReader(f) + if err != nil { + fail(w, http.StatusBadRequest, "无法解析 Excel: "+err.Error()) + return + } + defer xl.Close() + sheet := xl.GetSheetList()[0] + rows, err := xl.GetRows(sheet) + if err != nil { + fail(w, http.StatusBadRequest, "读取工作表失败: "+err.Error()) + return + } + if len(rows) <= 1 { + fail(w, http.StatusBadRequest, "文件无数据行(首行为表头,需至少一行数据)") + return + } + plans, errs, total := parseInboundImportPlan(ctx, rows, mode) + if errs == nil { + errs = []importErr{} + } + ok(w, map[string]any{"total": total, "success": len(plans), "failed": len(errs), "errors": errs}) + } +} + // ternary 小工具:condition 为真返回 a,否则 b func ternary(cond bool, a, b int) int { if cond { diff --git a/bj_power_wms/internal/handler/material.go b/bj_power_wms/internal/handler/material.go index 9b04954..aa9751a 100644 --- a/bj_power_wms/internal/handler/material.go +++ b/bj_power_wms/internal/handler/material.go @@ -860,116 +860,8 @@ func excelMaterialImportHandler(ctx *svc.ServiceContext) http.HandlerFunc { return } - type planRow struct { - row int - code string - name string - spec string - unit string - manageMode int - snMode int // 序列号=是/否:按类型默认联动派生(电气件→1,其余→2) - itemType int - description string - } - plans := make([]planRow, 0, len(rows)-1) - errs := make([]importErr, 0) - - // 表头→列下标映射:容忍列顺序变化与多余列(如「物料类别」/旧「品类」插在单位与类型之间)。 - // 先按"去括号后的表头名"精确匹配,再按关键字包含兜底(顺序稳定),都找不到回退模板固定下标。 - normHeader := func(s string) string { - s = strings.TrimSpace(s) - for _, op := range []string{"(", "("} { - if i := strings.Index(s, op); i >= 0 { - s = s[:i] - } - } - return strings.TrimSpace(s) - } - headerNorm := make([]string, len(rows[0])) - for j, h := range rows[0] { - headerNorm[j] = normHeader(h) - } - colOf := func(names []string, fallback int) int { - for _, n := range names { - for j, hn := range headerNorm { - if hn == n { - return j - } - } - } - for _, n := range names { - for j, hn := range headerNorm { - if hn != "" && strings.Contains(hn, n) { - return j - } - } - } - return fallback - } - codeCol := colOf([]string{"图号", "物料编码", "编码"}, 0) - nameCol := colOf([]string{"名称", "物料名称"}, 1) - specCol := colOf([]string{"规格", "规格型号"}, 2) - unitCol := colOf([]string{"单位"}, 3) - typeCol := colOf([]string{"类型", "管理类型", "管理粒度"}, 4) - catCol := colOf([]string{"物料类别", "品类", "类别"}, -1) - descCol := colOf([]string{"说明", "备注", "描述"}, 5) - - // 阶段1:解析 + 校验(不落库) - for i, row := range rows { - if i == 0 { - continue // 表头 - } - cell := func(idx int) string { - if idx < 0 || idx >= len(row) { - return "" - } - return strings.TrimSpace(row[idx]) - } - pr := planRow{row: i + 1} - pr.code = cell(codeCol) - pr.name = cell(nameCol) - pr.spec = cell(specCol) - pr.unit = cell(unitCol) - pr.manageMode = parseManageMode(cell(typeCol)) - pr.itemType = parseItemType(cell(catCol)) - pr.snMode = snModeByType(pr.manageMode) - if pr.itemType == invCatFinished { - pr.snMode = snModeSN // 成品强制「序列号=是」(与编辑/同步同口径,2026-10-19 拍板) - } - pr.description = cell(descCol) - - if pr.code == "" { - errs = append(errs, importErr{pr.row, pr.code, "图号为空"}) - continue - } - if pr.name == "" { - errs = append(errs, importErr{pr.row, pr.code, "名称为空"}) - continue - } - if pr.spec == "" { - errs = append(errs, importErr{pr.row, pr.code, "规格型号为空"}) - continue - } - if pr.unit == "" { - errs = append(errs, importErr{pr.row, pr.code, "单位为空"}) - continue - } - if pr.manageMode == 0 { - errs = append(errs, importErr{pr.row, pr.code, "类型无法识别,请填写「结构件/电气件/其他」(兼容 1/2/3)"}) - continue - } - if catCol >= 0 && cell(catCol) != "" && pr.itemType == 0 { - errs = append(errs, importErr{pr.row, pr.code, "物料类别无法识别,请填写「原材料/成品」(兼容 1/3;半成品不是物料类别,「其他」已取消)"}) - continue - } - exists, _ := ctx.EntClient.Material.Query(). - Where(material.CodeEQ(pr.code)).Exist(ctx0()) - if exists { - errs = append(errs, importErr{pr.row, pr.code, "图号已存在: " + pr.code}) - continue - } - plans = append(plans, pr) - } + // 阶段1:解析 + 逐行校验(不落库)——与预检端点 excelMaterialImportPreviewHandler 共用同一函数,规则同源 + plans, errs := parseMaterialImportPlan(ctx, rows) // 阶段2:有错则整体拒绝,一行都不写 if len(errs) > 0 { @@ -1026,3 +918,160 @@ func excelMaterialImportHandler(ctx *svc.ServiceContext) http.HandlerFunc { ok(w, map[string]any{"success": len(plans), "failed": 0, "errors": []importErr{}}) } } + +// materialImportPlan 物料档案导入单行写入计划(预检与写入共用同一解析/校验,规则同源不漂移)。 +type materialImportPlan struct { + row int + code string + name string + spec string + unit string + manageMode int + snMode int // 序列号=是/否:按类型默认联动派生(电气件→1,其余→2) + itemType int + description string +} + +// parseMaterialImportPlan 阶段1:解析 + 逐行校验(只读不落库):图号必填且库内唯一 / +// 名称、规格、单位必填 / 类型、物料类别合法。返回通过校验的行计划与逐行错误。 +func parseMaterialImportPlan(ctx *svc.ServiceContext, rows [][]string) ([]materialImportPlan, []importErr) { + plans := make([]materialImportPlan, 0, len(rows)-1) + errs := make([]importErr, 0) + + // 表头→列下标映射:容忍列顺序变化与多余列(如「物料类别」/旧「品类」插在单位与类型之间)。 + // 先按"去括号后的表头名"精确匹配,再按关键字包含兜底(顺序稳定),都找不到回退模板固定下标。 + normHeader := func(s string) string { + s = strings.TrimSpace(s) + for _, op := range []string{"(", "("} { + if i := strings.Index(s, op); i >= 0 { + s = s[:i] + } + } + return strings.TrimSpace(s) + } + headerNorm := make([]string, len(rows[0])) + for j, h := range rows[0] { + headerNorm[j] = normHeader(h) + } + colOf := func(names []string, fallback int) int { + for _, n := range names { + for j, hn := range headerNorm { + if hn == n { + return j + } + } + } + for _, n := range names { + for j, hn := range headerNorm { + if hn != "" && strings.Contains(hn, n) { + return j + } + } + } + return fallback + } + codeCol := colOf([]string{"图号", "物料编码", "编码"}, 0) + nameCol := colOf([]string{"名称", "物料名称"}, 1) + specCol := colOf([]string{"规格", "规格型号"}, 2) + unitCol := colOf([]string{"单位"}, 3) + typeCol := colOf([]string{"类型", "管理类型", "管理粒度"}, 4) + catCol := colOf([]string{"物料类别", "品类", "类别"}, -1) + descCol := colOf([]string{"说明", "备注", "描述"}, 5) + + for i, row := range rows { + if i == 0 { + continue // 表头 + } + cell := func(idx int) string { + if idx < 0 || idx >= len(row) { + return "" + } + return strings.TrimSpace(row[idx]) + } + pr := materialImportPlan{row: i + 1} + pr.code = cell(codeCol) + pr.name = cell(nameCol) + pr.spec = cell(specCol) + pr.unit = cell(unitCol) + pr.manageMode = parseManageMode(cell(typeCol)) + pr.itemType = parseItemType(cell(catCol)) + pr.snMode = snModeByType(pr.manageMode) + if pr.itemType == invCatFinished { + pr.snMode = snModeSN // 成品强制「序列号=是」(与编辑/同步同口径,2026-10-19 拍板) + } + pr.description = cell(descCol) + + if pr.code == "" { + errs = append(errs, importErr{pr.row, pr.code, "图号为空"}) + continue + } + if pr.name == "" { + errs = append(errs, importErr{pr.row, pr.code, "名称为空"}) + continue + } + if pr.spec == "" { + errs = append(errs, importErr{pr.row, pr.code, "规格型号为空"}) + continue + } + if pr.unit == "" { + errs = append(errs, importErr{pr.row, pr.code, "单位为空"}) + continue + } + if pr.manageMode == 0 { + errs = append(errs, importErr{pr.row, pr.code, "类型无法识别,请填写「结构件/电气件/其他」(兼容 1/2/3)"}) + continue + } + if catCol >= 0 && cell(catCol) != "" && pr.itemType == 0 { + errs = append(errs, importErr{pr.row, pr.code, "物料类别无法识别,请填写「原材料/成品」(兼容 1/3;半成品不是物料类别,「其他」已取消)"}) + continue + } + exists, _ := ctx.EntClient.Material.Query(). + Where(material.CodeEQ(pr.code)).Exist(ctx0()) + if exists { + errs = append(errs, importErr{pr.row, pr.code, "图号已存在: " + pr.code}) + continue + } + plans = append(plans, pr) + } + return plans, errs +} + +// excelMaterialImportPreviewHandler POST /api/material/import/preview 物料档案导入预检(只读): +// 复用写入端点的阶段1校验(parseMaterialImportPlan,同一函数保证规则同源),不写任何数据。 +// 返回 {total 总行数, success 将成功行数, failed 失败行数, errors 逐行失败原因(行号+图号+原因)}。 +func excelMaterialImportPreviewHandler(ctx *svc.ServiceContext) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + if err := r.ParseMultipartForm(20 << 20); err != nil { + fail(w, http.StatusBadRequest, "文件上传失败: "+err.Error()) + return + } + f, _, err := r.FormFile("file") + if err != nil { + fail(w, http.StatusBadRequest, "缺少 file 字段") + return + } + defer f.Close() + + xl, err := excelize.OpenReader(f) + if err != nil { + fail(w, http.StatusBadRequest, "无法解析 Excel: "+err.Error()) + return + } + defer xl.Close() + sheet := xl.GetSheetList()[0] + rows, err := xl.GetRows(sheet) + if err != nil { + fail(w, http.StatusBadRequest, "读取工作表失败: "+err.Error()) + return + } + if len(rows) <= 1 { + fail(w, http.StatusBadRequest, "文件无数据行(首行为表头,需至少一行数据)") + return + } + plans, errs := parseMaterialImportPlan(ctx, rows) + if errs == nil { + errs = []importErr{} + } + ok(w, map[string]any{"total": len(rows) - 1, "success": len(plans), "failed": len(errs), "errors": errs}) + } +} diff --git a/bj_power_wms/internal/handler/routes.go b/bj_power_wms/internal/handler/routes.go index 6b69af0..b56f44f 100644 --- a/bj_power_wms/internal/handler/routes.go +++ b/bj_power_wms/internal/handler/routes.go @@ -62,6 +62,7 @@ func RegisterHandlers(server *rest.Server, ctx *svc.ServiceContext) { {Method: http.MethodGet, Path: "/api/material/detail", Handler: getMaterialHandler(ctx)}, {Method: http.MethodGet, Path: "/api/material/export", Handler: requirePerm(ctx, "material:export", exportMaterialsHandler(ctx))}, {Method: http.MethodPost, Path: "/api/material/import", Handler: requirePerm(ctx, "material:import", excelMaterialImportHandler(ctx))}, + {Method: http.MethodPost, Path: "/api/material/import/preview", Handler: requirePerm(ctx, "material:import", excelMaterialImportPreviewHandler(ctx))}, {Method: http.MethodGet, Path: "/api/material/import-template", Handler: requirePerm(ctx, "material:import", excelMaterialImportTemplateHandler(ctx))}, {Method: http.MethodPost, Path: "/api/material/toggle-status", Handler: requirePerm(ctx, "material:edit", toggleMaterialStatusHandler(ctx))}, {Method: http.MethodPost, Path: "/api/material/retry-sync", Handler: requirePerm(ctx, "material:edit", retryMaterialSyncHandler(ctx))}, @@ -76,6 +77,7 @@ func RegisterHandlers(server *rest.Server, ctx *svc.ServiceContext) { {Method: http.MethodGet, Path: "/api/inbound/details", Handler: inboundDetailsHandler(ctx)}, {Method: http.MethodGet, Path: "/api/inbound/export", Handler: exportInboundHandler(ctx)}, {Method: http.MethodPost, Path: "/api/inbound/batch-excel", Handler: excelInboundHandler(ctx)}, + {Method: http.MethodPost, Path: "/api/inbound/batch-excel/preview", Handler: excelInboundPreviewHandler(ctx)}, {Method: http.MethodGet, Path: "/api/inbound/import-template", Handler: excelInboundImportTemplateHandler(ctx)}, // 入库库位联动:选物料后回填最近一次入库库位 {Method: http.MethodGet, Path: "/api/inbound/last-location", Handler: lastInboundLocationHandler(ctx)}, @@ -372,6 +374,7 @@ func RegisterHandlers(server *rest.Server, ctx *svc.ServiceContext) { {Method: http.MethodPost, Path: "/api/internal/outbound/delivered", Handler: wrapInternal(ctx)(markOutboundDeliveredHandler(ctx))}, // 配送单送达回写(2026-11-05 拍板:AGV 卸货放行后 MES 回写;配送单不存在时忽略,兼容旧链路) {Method: http.MethodPost, Path: "/api/internal/delivery/delivered", Handler: wrapInternal(ctx)(deliveryDeliveredInternalHandler(ctx))}, + {Method: http.MethodGet, Path: "/api/internal/delivery/status", Handler: wrapInternal(ctx)(deliveryStatusInternalHandler(ctx))}, }, ) } diff --git a/bj_power_wms/internal/svc/service_context.go b/bj_power_wms/internal/svc/service_context.go index a91adbe..e3eece9 100644 --- a/bj_power_wms/internal/svc/service_context.go +++ b/bj_power_wms/internal/svc/service_context.go @@ -33,23 +33,15 @@ func NewServiceContext(c config.Config) *ServiceContext { Dbname: c.Postgres.DBName, } - // 目标数据库不存在则自动创建 - if err := db.EnsureDB(conf); err != nil { + // 2026-11-06 拍板:启动路径禁止改库结构(建库/建表/补列/种子全部摘除)。 + // 迁移与种子改为显式 CLI(bj_power_wms migrate / seed / reset-all,管理员密码门禁), + // 部署时手工执行;启动期只做只读校验,缺表直接报错提示先迁移,绝不自动补。 + if err := db.CheckSchema(conf); err != nil { panic(err) } entClient := db.MustNewDB(conf) - // 启动时自动建表 - if err := db.AutoMigrate(entClient); err != nil { - panic(err) - } - - // 首次启动预置基础数据 - if err := db.SeedIfEmpty(entClient); err != nil { - panic(err) - } - // MES 地址:sys_config 覆盖优先(基础设置页可改,保存即生效;2026-11-02) mes := mesclient.New(c.Mes.BaseURL, c.Mes.Token) if rows, err := entClient.SysConfig.Query().All(context.Background()); err == nil { diff --git a/bj_power_wms/web/static/index.html b/bj_power_wms/web/static/index.html index e40479c..51e1d09 100644 --- a/bj_power_wms/web/static/index.html +++ b/bj_power_wms/web/static/index.html @@ -6,7 +6,7 @@ WMS库房管理 - + diff --git a/bj_power_workstation/frontend/src/api/index.js b/bj_power_workstation/frontend/src/api/index.js index cf42ce4..49aae62 100644 --- a/bj_power_workstation/frontend/src/api/index.js +++ b/bj_power_workstation/frontend/src/api/index.js @@ -31,10 +31,7 @@ export const bindRemove = (data) => request.post('/api/bind/remove', data) // 我的工作量(代理 MES,按当前登录人查询) export const getWorkload = (params) => request.get('/api/workload', { params }) -// 拧紧结果列表(本地 SQLite):params 传 {sn} 只取当前工件的拧紧记录 -export const getTighteningList = (params) => request.get('/api/tightening/list', { params }) - -// 录入一条拧紧数据:工件走到拧紧工艺步骤、拧紧枪把扭矩值打入输入框回车时触发 +// 录入一条拧紧数据:工件走到拧紧工艺步骤、拧紧枪把扭矩值打入输入框回车时触发(实时直连 MES,断网即失败) // {sn, workOrderNo, stepId, stepName, screwNo, torque, angle, result, operator} export const submitTorque = (data) => request.post('/api/tightening/record', data) @@ -47,18 +44,9 @@ export const reportTempStore = (data) => request.post('/api/report/temp-store', // 工件报废/人工取走登记(与暂存退库语义互斥:报废=永久退出,退库=可重上线) export const reportScrap = (data) => request.post('/api/report/scrap', data) -// 手动触发一轮同步 -export const syncFlush = () => request.post('/api/sync/flush') - // 退出登录(通知 MES 记录"工位终端退出"操作日志,尽力而为) export const stationLogout = (data) => request.post('/api/station/logout', data) -// 待同步统计 -export const getSyncStats = () => request.get('/api/sync/stats') - -// 人工重传处理:修正 payload(如重选点位)后按当前登录人身份再次提交 -export const retryQueue = (data) => request.post('/api/sync/retry-queue', data) - // 工艺文件免鉴权直链(iframe / window.open 用):query 传名,支持日期子目录文件名 export const pdfOpenUrl = (name) => '/pdfview?name=' + encodeURIComponent(name) @@ -71,7 +59,7 @@ export const fileNameFromUrl = (u) => { } // ---------- 产线点位 / 叫料(代理 MES) ---------- -// 产线点位台账(上料位/工位/缓存位/接驳台/末端 当前工件),唯一事实源 +// 产线点位台账(主线停靠位/缓存位/工位/末端 当前工件),唯一事实源 export const getLinePoints = () => request.get('/api/line/points') // 点位人工记账:{pointNo, sn, orderNo, action: 'IN'|'OUT'}(扫码即到位凭证:IN=上料到位、OUT=下料释放) diff --git a/bj_power_workstation/frontend/src/help.js b/bj_power_workstation/frontend/src/help.js index 9937028..3e06b24 100644 --- a/bj_power_workstation/frontend/src/help.js +++ b/bj_power_workstation/frontend/src/help.js @@ -5,15 +5,13 @@ export const helpWorkstation = { title: '工位终端 使用说明', overview: - '工位终端运行在 DOCK01~21 各工艺工位的触屏设备上,是产线最一线的执行入口。\n\n标准流程:①确认本工位号 → ②扫描工件 SN → ③照工艺图纸用拧紧枪打螺丝 → ④看拧紧结果是否全部 OK → ⑤点「报工完成」→ 工件流转到下一工位。\n\n数据链路:下发任务(MES) → 扫码(MES工位任务) → 拧紧结果(丹尼科尔拧紧枪采集,本地SQLite缓存) → 工艺完成上报(MES) → 拧紧/追溯数据回到 MES 管理后台。', + '工位终端运行在 DOCK01~21 各工艺工位的触屏设备上,是产线最一线的执行入口。\n\n标准流程:①确认本工位号 → ②扫描工件 SN → ③照工艺图纸用拧紧枪打螺丝 → ④看拧紧结果是否全部 OK → ⑤点「报工完成」→ 工件流转到下一工位。\n\n数据链路:下发任务(MES) → 扫码(MES工位任务) → 拧紧结果(丹尼科尔拧紧枪采集,实时上报MES) → 工艺完成上报(MES) → 拧紧/追溯数据回到 MES 管理后台。所有操作实时上报 MES,断网时操作直接失败并提示重试,不做离线缓存。', sections: [ { title: '顶部与工位', - overview: '顶部显示当前工位号、登录人、离线同步状态。', + overview: '顶部显示当前工位号、登录人。', fields: [ { name: '工位号', source: '下拉选择/固定。数据来自本机配置或固定的 DOCK01~21。', purpose: '当前所在工位,决定读取哪道工艺的任务', fill: '固定工位由配置锁定不可改;否则选与实际工位一致编号' }, - { name: '待同步 N 条', source: '系统统计。数据来自本地 SQLite 中尚未上传的记录数。', purpose: '标记有拧紧/工艺数据没上报 MES(离线缓存)', fill: '点开「重传处理」可立即补传(立即同步一轮)' }, - { name: '待处理 N 条', source: '系统统计。被 MES 明确拒绝(如所选点位已被其他工件占用)的记录。', purpose: '提醒有数据需人工处理后才能上报', fill: '点开「重传处理」查看失败原因 → 重选空闲点位 → 再次提交;拒绝是保护,人工重选是出路' }, { name: '登录人', source: '登录账号。来自工位终端登录时输入。', purpose: '当前操作员,上报记录会带此名字溯源', fill: '开机登入本人账号,勿共用' } ] }, @@ -63,10 +61,9 @@ export const helpWorkstation = { { title: '底部三大按钮', fields: [ - { name: '报工完成', source: '按钮操作 + 确认框。数据上报到 MES。', purpose: '本工位这道工艺做完,通知 MES 流转到下一工位', fill: '点「报工完成」二次确认;联网失败自动离线缓存' }, + { name: '报工完成', source: '按钮操作 + 确认框。数据上报到 MES。', purpose: '本工位这道工艺做完,通知 MES 流转到下一工位', fill: '点「报工完成」二次确认;断网时操作失败,检查网络后重试' }, { name: '暂存退库', source: '按钮操作 + 确认框。数据上报到 MES(记录已完成工艺)。', purpose: '工件本工艺不做完,退回库房暂存', fill: '点击并二次确认;系统记录已完成工艺,重上线从下一工位继续' }, - { name: '报废/取走', source: '按钮操作 + 原因必填弹窗。数据上报到 MES(工件状态置「已报废」)。', purpose: '工件被人工从产线取走(报废/丢失/磕碰损伤/人工处理)时的现场登记入口:永久退出产线且不可恢复、不计入在制,工单由计划员强制完工收尾', fill: '扫 SN → 点「报废/取走」→ 按提示填原因(必填)→ 确认登记。注意与「暂存退库」互斥:暂存=合法暂停可重上线,报废=永久退出;MES 不可达时提示稍后重试,不做离线排队(防重复误报)' }, - { name: '待同步(顶部按钮)', source: '按钮操作。打开「重传处理」。', purpose: '查看/处理未上报数据:立即同步一轮、或对 MES 拒绝的记录重选点位后再次提交', fill: '看到「待同步」或「待处理」非 0 时点开处理' } + { name: '报废/取走', source: '按钮操作 + 原因必填弹窗。数据上报到 MES(工件状态置「已报废」)。', purpose: '工件被人工从产线取走(报废/丢失/磕碰损伤/人工处理)时的现场登记入口:永久退出产线且不可恢复、不计入在制,工单由计划员强制完工收尾', fill: '扫 SN → 点「报废/取走」→ 按提示填原因(必填)→ 确认登记。注意与「暂存退库」互斥:暂存=合法暂停可重上线,报废=永久退出;MES 不可达时提示稍后重试,不做离线排队(防重复误报)' } ] } ] @@ -108,7 +105,7 @@ export const helpOnline = { title: '工件当前位置', overview: '建档时登记工件此刻实际所在的产线点位,建档成功后该点位自动标记为被本工件占用(产线点位台账为唯一事实源)。', fields: [ - { name: '工件当前位置', source: 'MES 产线点位台账(只列空闲点位)。', purpose: '记录工件物理位置,供产线点位图/看板/位置核对使用', fill: '分组下拉(上料位/缓存位/停靠位/工位),默认本工位可用位,无则 C1/上料位;点位被他人占用后自动失效需重选' } + { name: '工件当前位置', source: 'MES 产线点位台账(只列空闲点位)。', purpose: '记录工件物理位置,供产线点位图/看板/位置核对使用', fill: '分组下拉(停靠位/缓存位/工位),默认 C1(空闲),C1 不可用则本工位可用位;点位被他人占用后自动失效需重选' } ] }, { @@ -125,7 +122,7 @@ export const helpOnline = { fields: [ { name: '工件 SN', source: '序列号=是:扫码枪扫来料SN(需已在 WMS 入库登记);序列号=否:系统自动生成。', purpose: '唯一识别本台成品,拧紧/工艺/追溯都挂在此 SN 下', fill: '序列号=是=扫描来料SN(必填,MES 校验其在 WMS 库存);序列号=否=无需手填,提交后系统自动发号' }, { name: '待流转在制品', source: 'MES 实时查询。已建档、尚未分配到工位的工件。', purpose: '看清已建档待流转的工件,防止重复建档', fill: '只读展示,点「刷新」更新' }, - { name: '确认建档上线', source: '按钮操作 + 确认框。数据上报到 MES。', purpose: '正式建档上线,工件进入产线待第 1 工位加工', fill: '满足工单/SN/领料核对后点击并二次确认;MES 不可达时自动离线缓存重传' } + { name: '确认建档上线', source: '按钮操作 + 确认框。数据上报到 MES。', purpose: '正式建档上线,工件进入产线待第 1 工位加工', fill: '满足工单/SN/领料核对后点击并二次确认;断网时操作失败,检查网络后重试' } ] } ] @@ -153,7 +150,7 @@ export const helpOffline = { overview: '列出已到产线末端待取件完工的工件,可点击带入 SN,核对后确认入库回流 WMS。', fields: [ { name: '末端待取件工件', source: 'MES 实时查询。已报工至工艺路线末端的在制工件。', purpose: '看清已到出料口待入库的工件,防止漏件', fill: '点某一行即带入该 SN 并自动查询完工状态' }, - { name: '确认完工入库(回流 WMS)', source: '按钮操作 + 确认框。MES 置工件 DONE 并推送 WMS 成品库存。', purpose: '正式完工入库,成品进入 WMS 库存可发货', fill: '核对无不合格后点击并二次确认;MES 不可达时自动离线缓存重传' } + { name: '确认完工入库(回流 WMS)', source: '按钮操作 + 确认框。MES 置工件 DONE 并推送 WMS 成品库存。', purpose: '正式完工入库,成品进入 WMS 库存可发货', fill: '核对无不合格后点击并二次确认;断网时操作失败,检查网络后重试。注意:确认后工件在本终端不可撤销——误入库需到 WMS 库存侧处置(在库处置/复检),本页没有撤回入口' } ] } ] diff --git a/bj_power_workstation/frontend/src/store/station.js b/bj_power_workstation/frontend/src/store/station.js index beffa98..3446156 100644 --- a/bj_power_workstation/frontend/src/store/station.js +++ b/bj_power_workstation/frontend/src/store/station.js @@ -7,9 +7,7 @@ import { getConfig, getLinePoints, getStationState, - getSyncStats, getTaskCurrent, - getTighteningList, getWip, occupyLinePoint, pauseStation, @@ -29,7 +27,6 @@ export const state = reactive({ tightRows: [], wip: [], bindPanel: null, - stats: { pendingTorque: 0, pendingQueue: 0 }, stepValues: {}, stepChecks: {}, bindInputs: {}, @@ -112,7 +109,7 @@ export const myPointSn = computed(() => (myPoint.value?.occupied ? myPoint.value export const myDocks = computed(() => state.points.filter((p) => p.pointType === 'DOCK' && Number(p.stationNo) === Number(state.stationNo)) ) -// 传送带主线点位(上料位/工位/缓存位/末端),按 seq 排序 +// 传送带主线点位(主线停靠位/缓存位/工位/末端),按 seq 排序 export const beltPoints = computed(() => [...state.points].filter((p) => p.pointType !== 'DOCK').sort((a, b) => (a.seq || 0) - (b.seq || 0)) ) @@ -137,9 +134,6 @@ export const manualNg = computed(() => ) export const autoNg = computed(() => state.tightRows.some((r) => r.result === 'NG')) export const hasNg = computed(() => manualNg.value || autoNg.value) -export const pendingTotal = computed(() => (state.stats.pendingTorque || 0) + (state.stats.pendingQueue || 0)) -// 待处理(死信):MES 业务拒绝、自动重传不可能成功,须人工重传处理 -export const deadTotal = computed(() => Number(state.stats.deadTotal || 0)) // 未勾选"检测确认"的步骤(needCheck=true 必须人工确认后才允许报工) export const missingChecks = computed(() => @@ -234,18 +228,10 @@ export async function loadPoints() { } } -// loadTight 只加载「当前工件」的拧紧记录(按 SN 过滤):拧紧数据绑定工件,切换工件即切换明细。 +// loadTight 拧紧记录刷新(2026-11-05 拍板:断网即失败,扭矩实时直连 MES、本地不持久化)。 +// 拧紧行改为「当前工件的会话内存态」:切换工件即清空,录入成功由 submitTorqueStep 追加。 export async function loadTight() { - if (!state.currentSn) { - state.tightRows = [] - return - } - try { - const data = await getTighteningList({ sn: state.currentSn, limit: 100 }) - state.tightRows = Array.isArray(data) ? data : (data?.list || []) - } catch { - state.tightRows = [] - } + state.tightRows = state.tightRows.filter((r) => r.sn === state.currentSn) } // submitTorqueStep 录入一条拧紧数据:工件走到拧紧工艺步骤、拧紧枪把扭矩值打入输入框回车时调用。 @@ -270,7 +256,18 @@ export async function submitTorqueStep(step, torque, angle) { result, operator: operatorName() }) - await loadTight() + // 本地不再持久化扭矩(断网即失败):会话内存追加一行供拧紧完成态/NG 拦截展示 + state.tightRows = [{ + sn: state.currentSn, + stepId: String(step.id), + stepName: step.name || '', + screwNo, + torque: t, + angle: Number(angle) || 0, + result, + operator: operatorName(), + createdAt: Date.now() + }, ...state.tightRows] return result } @@ -291,11 +288,7 @@ export async function loadBind() { } } -export async function loadStats() { - try { - state.stats = await getSyncStats() - } catch { /* 静默 */ } -} +// 2026-11-05 拍板:断网即失败,无离线队列/同步统计(原 loadStats 已移除)。 // loadWip 拉取停在本工位的未完工在制品(5.2 默认展示)。 // stationNo 传本工位号(正整数字符串/数字)。 @@ -320,7 +313,7 @@ export async function loadWipScope(scope) { } export function refreshAll() { - return Promise.all([loadTask(), loadTight(), loadStats(), loadPoints(), loadWip(), loadStationState()]) + return Promise.all([loadTask(), loadTight(), loadPoints(), loadWip(), loadStationState()]) } // loadStationState 拉取本工位当天的停单状态(MES /api/internal/station/state),刷新横幅与按钮。 diff --git a/bj_power_workstation/frontend/src/utils/request.js b/bj_power_workstation/frontend/src/utils/request.js index 30f22e0..7969d09 100644 --- a/bj_power_workstation/frontend/src/utils/request.js +++ b/bj_power_workstation/frontend/src/utils/request.js @@ -7,6 +7,8 @@ import { ElMessage } from 'element-plus' * - 响应头 X-Renewed-Token 自动保存(滑动续签) * - 401 清除登录态并跳转登录页 * - 业务 code!==0 弹错并 reject;data 缺省时返回原响应体 + * - 断网/失败操作直接报错返回:不排队、不自动重试(2026-11-06 拍板)—— + * 工人看到失败会重做,静默重试会造成重复提交(重复叫料/重复报工等) */ const TOKEN_KEY = 'ws_token' const USER_KEY = 'ws_user' diff --git a/bj_power_workstation/frontend/src/views/Login.vue b/bj_power_workstation/frontend/src/views/Login.vue index 92bfda5..91c121c 100644 --- a/bj_power_workstation/frontend/src/views/Login.vue +++ b/bj_power_workstation/frontend/src/views/Login.vue @@ -43,7 +43,7 @@ import { onMounted, ref } from 'vue' import { useRouter } from 'vue-router' import { ElMessage } from 'element-plus' -import { getConfig, getSyncStats, login } from '../api' +import { getConfig, login } from '../api' import { setAuth } from '../utils/request' const router = useRouter() @@ -83,28 +83,6 @@ async function submit() { setAuth(data.accessToken, data.user) ElMessage.success('登录成功') router.push('/main') - // 仅提示本人上次发送失败、仍留在本机的数据条数(不自动打开任何页面); - // 他人登录时后端按操作人隔离,不会返回、也不会代发这些数据。 - try { - const stats = await getSyncStats() - const n = Number(stats?.pendingTotal || 0) - const d = Number(stats?.deadTotal || 0) - if (d > 0) { - ElMessage({ - type: 'warning', - message: `您有 ${d} 条数据被 MES 拒绝、需人工处理(如点位已被占用):请点顶部「待同步」查看失败原因、重选点位后再次提交`, - duration: 8000, - showClose: true - }) - } else if (n > 0) { - ElMessage({ - type: 'info', - message: `您上次有 ${n} 条报工数据发送失败,仍保留在本机;留意顶部「待同步」即可,系统会自动重发`, - duration: 8000, - showClose: true - }) - } - } catch { /* 统计不可达时静默,不阻断登录 */ } } catch (e) { // 错误提示已由 request 封装统一弹出 } finally { diff --git a/bj_power_workstation/frontend/src/views/Main.vue b/bj_power_workstation/frontend/src/views/Main.vue index 3e12159..d1d03ef 100644 --- a/bj_power_workstation/frontend/src/views/Main.vue +++ b/bj_power_workstation/frontend/src/views/Main.vue @@ -18,9 +18,6 @@
- - 待同步 {{ pendingTotal }} - 我的工作量 {{ speechMuted ? '🔇' : '🔊' }} @@ -65,7 +62,6 @@ - @@ -146,7 +142,6 @@ import InspectPanel from './panels/InspectPanel.vue' import OnlinePanel from './panels/OnlinePanel.vue' import OfflinePanel from './panels/OfflinePanel.vue' import WorkloadDialog from './panels/WorkloadDialog.vue' -import SyncQueueDialog from './panels/SyncQueueDialog.vue' import PageHelp from '../components/PageHelp.vue' import { helpInspect, @@ -164,16 +159,13 @@ import { hasTab, loadConfig, loadPoints, - loadStats, loadStationState, loadTight, loadTask, loadWip, - deadTotal, orderNo, paused, pauseReason, - pendingTotal, refreshAll, sn, state, @@ -209,7 +201,6 @@ const helpData = computed(() => HELP_MAP[tab.value] || helpWorkstation) let timerTask = null let timerTight = null -let timerStats = null let timerClock = null let alertES = null // 本机报警 SSE(EventSource,断线自动重连) @@ -320,26 +311,12 @@ async function logout() { } catch { return } } } catch { /* MES 不可达不拦截退出 */ } - // 退出前先本地退出(服务端登出失败也照样退),再按响应提醒本人未发送成功的条数 - let data = null + // 退出前先本地退出(服务端登出失败也照样退) try { - data = await stationLogout({ username: user?.username || '', stationNo: stationNo.value || 0 }) + await stationLogout({ username: user?.username || '', stationNo: stationNo.value || 0 }) } catch { /* MES 不可达也继续本地退出 */ } clearAuth() router.push('/login') - const n = Number(data?.pendingTotal || 0) - const d = Number(data?.deadTotal || 0) - if (n > 0 || d > 0) { - const parts = [] - if (n > 0) parts.push(`${n} 条待自动重传`) - if (d > 0) parts.push(`${d} 条待人工处理(被 MES 拒绝,需重选点位后再次提交)`) - ElMessage({ - type: 'warning', - message: `您有数据未上报成功,仍保留在本机(只有您本人登录可见/可发送):${parts.join(';')}。下次登录后请点「待同步」处理。`, - duration: 8000, - showClose: true - }) - } } /* ===================== 下班/结束作业(2026-11-03 拍板闭环;2026-11-04 G3/G4 升级) ===================== */ @@ -492,7 +469,6 @@ onMounted(async () => { timerTask = setInterval(loadTask, 5000) // 任务 5 秒 timerTight = setInterval(loadTight, 2000) // 拧紧结果 2 秒 - timerStats = setInterval(loadStats, 10000) // 同步统计 10 秒 connectAlertStream() // 本机报警事件流(SSE,断线自动重连) timerClock = setInterval(() => { tickClock() @@ -505,7 +481,6 @@ onMounted(async () => { onBeforeUnmount(() => { clearInterval(timerTask) clearInterval(timerTight) - clearInterval(timerStats) clearInterval(timerClock) if (alertES) { alertES.close(); alertES = null } }) diff --git a/bj_power_workstation/frontend/src/views/panels/OfflinePanel.vue b/bj_power_workstation/frontend/src/views/panels/OfflinePanel.vue index 2cdd8fa..b8df02b 100644 --- a/bj_power_workstation/frontend/src/views/panels/OfflinePanel.vue +++ b/bj_power_workstation/frontend/src/views/panels/OfflinePanel.vue @@ -261,7 +261,7 @@ async function onFinish() { pointNo: pointNo.value, operator: operatorName() }) - ElMessage.success(data?.queued ? 'MES 暂不可达,已离线缓存,稍后自动重传' : '完工入库成功,已回流 WMS') + ElMessage.success('完工入库成功,已回流 WMS') snInput.value = '' trace.value = null pointNo.value = '' diff --git a/bj_power_workstation/frontend/src/views/panels/OnlinePanel.vue b/bj_power_workstation/frontend/src/views/panels/OnlinePanel.vue index 873eddc..477cc3f 100644 --- a/bj_power_workstation/frontend/src/views/panels/OnlinePanel.vue +++ b/bj_power_workstation/frontend/src/views/panels/OnlinePanel.vue @@ -153,16 +153,35 @@ const snTip = computed(() => { // 待流转在制品:MES 已按 scope=pending 过滤(ONLINE 未分配工位),此处直接透出 const onlineWip = computed(() => wip.value || []) -// 工件当前位置:按产线点位台账分组(C/H 3.1),只列空闲点位。 -// 分组 = 上料位(FEED) / 缓存位(CACHE) / 停靠位(DOCK=AGV接驳台) / 工位(STATION); -// label = 中文名(编号),value = 编号。 -const POINT_TYPE_GROUP = { FEED: '上料位', CACHE: '缓存位', DOCK: '停靠位', STATION: '工位' } +// 业务口径(2026-11-06 条20 拍板):工件位置下拉的「工位」分组按当前选中工单的工艺组合候选工位过滤; +// 未选工单时不显示工位分组(提示走 blockTip「请先选择工单号」)。 +// 工艺组合数据源=工单列表接口自带 flowCombination[{flowId,stationNo}],前端本地过滤(改动最小)。 +const routeStations = computed(() => { + if (!form.orderNo) return null + const opt = orderOptions.value.find((o) => o.value === form.orderNo) + const combo = (opt && opt.raw && opt.raw.flowCombination) || [] + const set = new Set() + for (const it of combo) { + const n = Number(it && it.stationNo) + if (!Number.isNaN(n)) set.add(n) + } + return set +}) + +// 工件当前位置:按产线点位台账分组(主线位置编址版 2026-11-05),只列空闲点位。 +// 分组 = 停靠位(STOP=C1/C4/C7/C10/C13/C15,不缓存) / 缓存位(CACHE=C2/C3/C5/C6/C8/C9/C11/C12/C14) / 工位(STATION); +// 文档无独立上料点位(上料=放主线任意位置或任意工位),FEED"上料位"已废弃删除;接驳台(DOCK=AGV 点位)不作落点、不进下拉。 +const POINT_TYPE_GROUP = { STOP: '停靠位', CACHE: '缓存位', STATION: '工位' } const startPointGroups = computed(() => { const groups = {} for (const p of state.points || []) { if (!p || p.occupied) continue const g = POINT_TYPE_GROUP[p.pointType] if (!g) continue + if (p.pointType === 'STATION') { + if (!routeStations.value) continue // 未选工单:不显示工位分组 + if (!routeStations.value.has(Number(p.stationNo))) continue // 不在本工单工艺组合内 + } if (!groups[g]) groups[g] = [] groups[g].push({ pointNo: p.pointNo, label: `${p.label || p.pointNo}(${p.pointNo})` }) } @@ -172,14 +191,14 @@ const startPointGroups = computed(() => { return Object.keys(groups).map((label) => ({ label, options: groups[label] })) }) -// 默认位置(按现有口径):本工位点位(空闲)→ 缓存位 C1 → 上料位;都不行返回空(阻断提交) +// 默认位置(2026-11-05 拍板):默认选中停靠位 C1(空闲;文档"上料位默认C1"); +// C1 不可用(被占/不存在)时回退本工位点位;都不行返回空(阻断提交,不传 0——提交必须为已选项) function defaultStartPointNo() { const pts = state.points || [] const free = (p) => p && !p.occupied + if (free(pts.find((p) => p.pointNo === 'C1'))) return 'C1' const mine = pts.find((p) => p.pointType === 'STATION' && String(p.pointNo) === String(state.stationNo)) if (free(mine)) return mine.pointNo - if (free(pts.find((p) => p.pointNo === 'C1'))) return 'C1' - if (free(pts.find((p) => p.pointType === 'FEED'))) return pts.find((p) => p.pointType === 'FEED').pointNo return '' } // 点位台账刷新后:未选/已失效(被他人占用)时回填默认值 @@ -232,6 +251,11 @@ async function loadOrders() { try { const list = await queryOrder({}) orders.value = Array.isArray(list) ? list : (list && list.list ? list.list : []) + // 业务口径(2026-11-06 条19 拍板):活跃工单只有一个时默认选中,工人少点一步 + if (!form.orderNo && orderOptions.value.length === 1) { + form.orderNo = orderOptions.value[0].value + onOrderChange(form.orderNo) + } } catch (e) { /* 统一错误提示 */ } loadingOrder.value = false } @@ -274,6 +298,8 @@ function genSn() { form.sn = `${prefix}-${stamp}-${rand}` } +// 业务口径(2026-11-06 拍板):断网时上线建档直接失败报错,不排队、不自动重试—— +// 工人看到失败会重做;静默重试会造成重复建档。 async function onSubmit() { if (!canSubmit.value) { ElMessage.warning(blockTip.value || '当前不满足建档条件') @@ -299,13 +325,9 @@ async function onSubmit() { pointNo: form.pointNo || undefined, operator: operatorName() }) - if (data && data.queued) { - ElMessage.success('MES 暂不可达,已离线缓存,稍后自动重传') - } else { - ElMessage.success('建档上线成功') - // #8 T3(建档提交):MES 已附 PLC↔MES 对账结果,命中则弹「两项」提示(不拦) - if (data && data.hasMismatch) showMismatch(data) - } + ElMessage.success('建档上线成功') + // #8 T3(建档提交):MES 已附 PLC↔MES 对账结果,命中则弹「两项」提示(不拦) + if (data && data.hasMismatch) showMismatch(data) form.sn = '' // 建档后该点位已被占用:回填下一个默认空闲位 form.pointNo = defaultStartPointNo() diff --git a/bj_power_workstation/frontend/src/views/panels/SyncQueueDialog.vue b/bj_power_workstation/frontend/src/views/panels/SyncQueueDialog.vue deleted file mode 100644 index c879c11..0000000 --- a/bj_power_workstation/frontend/src/views/panels/SyncQueueDialog.vue +++ /dev/null @@ -1,236 +0,0 @@ - - - - - diff --git a/bj_power_workstation/frontend/src/views/panels/WorkPanel.vue b/bj_power_workstation/frontend/src/views/panels/WorkPanel.vue index 6b24ed3..f16176a 100644 --- a/bj_power_workstation/frontend/src/views/panels/WorkPanel.vue +++ b/bj_power_workstation/frontend/src/views/panels/WorkPanel.vue @@ -253,7 +253,6 @@ import { hasNg, loadBind, loadPoints, - loadStats, loadTask, loadWip, manualSteps, @@ -664,10 +663,9 @@ async function onProcessDone() { startedAt: startedAt.value || '', endedAt: new Date().toISOString() }) - ElMessage.success(data?.queued ? 'MES 暂不可达,已离线缓存,稍后自动重传' : '报工成功') + ElMessage.success('报工成功') setCurrentSn('') loadTask() - loadStats() loadPoints() } catch (e) { /* 统一错误提示 */ } } @@ -694,10 +692,9 @@ async function onTempStore() { flowId: flowId.value, operator: operatorName() }) - ElMessage.success(data?.queued ? 'MES 暂不可达,已离线缓存' : '暂存退库已上报') + ElMessage.success('暂存退库已上报') setCurrentSn('') loadTask() - loadStats() loadPoints() } catch (e) { /* 统一错误提示 */ } } @@ -730,7 +727,6 @@ async function onScrap() { ElMessage.success('已登记报废/取走') setCurrentSn('') loadTask() - loadStats() loadPoints() } catch (e) { /* 统一错误提示 */ } } diff --git a/bj_power_workstation/internal/config/config.go b/bj_power_workstation/internal/config/config.go index db29884..5a45b6a 100644 --- a/bj_power_workstation/internal/config/config.go +++ b/bj_power_workstation/internal/config/config.go @@ -55,12 +55,6 @@ type ScannerConfig struct { // Enable=false 时终端不走 OP 自动接收,仍由人工在界面录入扭矩值(兼容无控制器/调试环境)。 // 类型定义见 internal/tightening.TighteningConfig(config 直接复用,避免重复定义)。 -// BacklogConfig 离线同步积压告警配置(补强#2 建议1):队列+拧紧未同步合计超阈值打告警。 -// 区分两种积压:① 无有效登录态(数据留在本地,等待当前操作人登录后继续发送);② 有登录态仍堆积(疑似 MES 网络/业务拒绝)。 -type BacklogConfig struct { - WarnThreshold int `json:",default=50"` // 待上报积压超过该值打告警(队列+拧紧合计);<=0 用默认 50 -} - type Config struct { rest.RestConf Auth AuthConfig `json:",optional"` @@ -69,7 +63,6 @@ type Config struct { Sqlite SqliteConfig `json:",optional"` Station StationConfig `json:",optional"` PdfCache PdfCacheConfig `json:",optional"` - Backlog BacklogConfig `json:",optional"` Tightening tightening.TighteningConfig `json:",optional"` Scanner ScannerConfig `json:",optional"` } \ No newline at end of file diff --git a/bj_power_workstation/internal/handler/auth.go b/bj_power_workstation/internal/handler/auth.go index 7d0b501..5d51006 100644 --- a/bj_power_workstation/internal/handler/auth.go +++ b/bj_power_workstation/internal/handler/auth.go @@ -103,14 +103,6 @@ func logoutHandler(ctx *svc.ServiceContext) http.HandlerFunc { StationNo int `json:"stationNo"` } _ = parseJSON(r, &req) - // 退出前先统计「当前登录人」尚未成功上报的本地数据条数,供前端提醒本人处理 - pendingQueue, pendingTorque := int64(0), int64(0) - deadQueue := int64(0) - if ss, sErr := ctx.Store.GetStationSession(); sErr == nil && ss != nil { - pendingQueue, _ = ctx.Store.PendingQueueCountForOperator(ss.UserID) - pendingTorque, _ = ctx.Store.PendingTorqueCountForOperator(ss.UserID) - deadQueue, _ = ctx.Store.DeadQueueCountForOperator(ss.UserID) - } username := strings.TrimSpace(req.Username) if username != "" { no := req.StationNo @@ -124,12 +116,7 @@ func logoutHandler(ctx *svc.ServiceContext) http.HandlerFunc { // 方案 B:退出即清除本地登录态与 Bearer 凭证 _ = ctx.Store.ClearStationSession() ctx.Mes.SetStationToken("") - ok(w, map[string]any{ - "pendingQueue": pendingQueue, - "pendingTorque": pendingTorque, - "pendingTotal": pendingQueue + pendingTorque, - "deadTotal": deadQueue, - }) + ok(w, map[string]any{"ok": true}) } } diff --git a/bj_power_workstation/internal/handler/report.go b/bj_power_workstation/internal/handler/report.go index efed4ba..dcfc35a 100644 --- a/bj_power_workstation/internal/handler/report.go +++ b/bj_power_workstation/internal/handler/report.go @@ -38,11 +38,11 @@ func mesRespCode(respBody []byte) string { // processDoneHandler POST /api/report/process-done // {sn, orderNo, flowId, stationNo, steps:[{stepId,name,value,text}], signs:[{stepId,signRole,signer,remark}], binds:[{materialCode,bindValue}], operator} -// 流程:先冲刷一轮积压 → 实时报 MES /api/internal/station/report; -// MES 不可达则写入 report_queue(kind=process_done) 并返回 data.queued=true(离线缓存稍后自动重传); -// MES 业务拒绝(HTTP200+code!=0,如装配物料未绑齐/电气件SN重复)直接失败回前端,绝不入离线队。 -// binds 为本次工艺的装机绑定(结构件批次/电气件SN),MES 端落库 + 齐套强校验;离线重传时原样携带。 -// signs 为 needOperatorSign 步骤的操作工签字(需求B 双签),原样转发 MES 强校验落库;离线重传时随 payload 保留。 +// 流程:实时报 MES /api/internal/station/report; +// MES 不可达直接失败回前端(2026-11-05 拍板:断网即失败,无离线队列/自动重试,工人确认后重做); +// MES 业务拒绝(HTTP200+code!=0,如装配物料未绑齐/电气件SN重复)直接失败回前端。 +// binds 为本次工艺的装机绑定(结构件批次/电气件SN),MES 端落库 + 齐套强校验。 +// signs 为 needOperatorSign 步骤的操作工签字(需求B 双签),原样转发 MES 强校验落库。 func processDoneHandler(ctx *svc.ServiceContext) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { var req struct { @@ -83,20 +83,12 @@ func processDoneHandler(ctx *svc.ServiceContext) http.HandlerFunc { return } - // 方案 B:操作人取自工位登录态可信身份,忽略浏览器请求体里的 operator(防冒名); - // operator_id 用于离线队列按操作人隔离发送(仅当前登录人自己的数据被发送) + // 方案 B:操作人取自工位登录态可信身份,忽略浏览器请求体里的 operator(防冒名) op := req.Operator - opID := int64(0) - if ss, sErr := ctx.Store.GetStationSession(); sErr == nil && ss != nil { - if ss.Name != "" { - op = ss.Name - } - opID = ss.UserID + if ss, sErr := ctx.Store.GetStationSession(); sErr == nil && ss != nil && ss.Name != "" { + op = ss.Name } - // 先尽力冲刷历史积压,失败不影响本次上报 - ctx.Syncer.RunOnce(r.Context()) - body := map[string]any{ "sn": req.Sn, "orderNo": req.OrderNo, @@ -135,14 +127,11 @@ func processDoneHandler(ctx *svc.ServiceContext) http.HandlerFunc { fail(w, http.StatusConflict, msg) return } - if qerr := ctx.Store.InsertQueueItem("process_done", string(payloadBytes), opID, op); qerr != nil { - fail(w, http.StatusInternalServerError, "上报失败且离线队列写入失败:"+qerr.Error()) - return - } - ctx.Store.AddEventLog(req.OrderNo, op, "process_done_queued", - "报工离线排队 sn="+req.Sn+" stationNo="+itoa(req.StationNo)) - logx.Errorf("工序完成上报失败已离线排队: %v", err) - ok(w, map[string]any{"queued": true}) + // 网络失败:直接报错(2026-11-05 拍板:断网即失败,无离线队列/自动重试,工人重做即可) + ctx.Store.AddEventLog(req.OrderNo, op, "process_done_failed", + "报工失败(MES不可达) sn="+req.Sn+" stationNo="+itoa(req.StationNo)) + logx.Errorf("工序完成上报失败(MES不可达): %v", err) + fail(w, http.StatusBadGateway, "MES 服务不可达,报工未成功,请检查网络后重试") return } // MES 业务拒绝兜底(理论上已由 BizError 分支处理):缺料/SN冲突等,直接失败,不入队 @@ -156,13 +145,13 @@ func processDoneHandler(ctx *svc.ServiceContext) http.HandlerFunc { ctx.Store.AddEventLog(req.OrderNo, op, "process_done", "工艺完成上报 sn="+req.Sn+" stationNo="+itoa(req.StationNo)+" flowId="+itoa(req.FlowId)+" binds="+itoa(len(req.Binds))) - ok(w, map[string]any{"queued": false}) + ok(w, map[string]any{"ok": true}) } } // tempStoreHandler POST /api/report/temp-store // {sn, orderNo, stationNo, flowId, operator} → 调 MES /api/internal/station/checkin(半成品入库)。 -// 不可达时以同样 payload 写入 report_queue(kind=temp_store)。 +// 不可达时直接失败回前端(2026-11-05 拍板:断网即失败,无离线队列)。 func tempStoreHandler(ctx *svc.ServiceContext) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { var req struct { @@ -181,20 +170,12 @@ func tempStoreHandler(ctx *svc.ServiceContext) http.HandlerFunc { return } - // 方案 B:操作人取自工位登录态可信身份,忽略浏览器请求体里的 operator(防冒名); - // operator_id 用于离线队列按操作人隔离发送(仅当前登录人自己的数据被发送) + // 方案 B:操作人取自工位登录态可信身份,忽略浏览器请求体里的 operator(防冒名) op := req.Operator - opID := int64(0) - if ss, sErr := ctx.Store.GetStationSession(); sErr == nil && ss != nil { - if ss.Name != "" { - op = ss.Name - } - opID = ss.UserID + if ss, sErr := ctx.Store.GetStationSession(); sErr == nil && ss != nil && ss.Name != "" { + op = ss.Name } - // 先尽力冲刷历史积压,失败不影响本次上报 - ctx.Syncer.RunOnce(r.Context()) - body := map[string]any{ "sn": req.Sn, "orderNo": req.OrderNo, @@ -219,14 +200,11 @@ func tempStoreHandler(ctx *svc.ServiceContext) http.HandlerFunc { fail(w, http.StatusConflict, msg) return } - if qerr := ctx.Store.InsertQueueItem("temp_store", string(payloadBytes), opID, op); qerr != nil { - fail(w, http.StatusInternalServerError, "上报失败且离线队列写入失败:"+qerr.Error()) - return - } - ctx.Store.AddEventLog(req.OrderNo, op, "temp_store_queued", - "暂存退库离线排队 sn="+req.Sn+" stationNo="+itoa(req.StationNo)) - logx.Errorf("暂存退库上报失败已离线排队: %v", err) - ok(w, map[string]any{"queued": true}) + // 网络失败:直接报错(2026-11-05 拍板:断网即失败,无离线队列/自动重试,工人重做即可) + ctx.Store.AddEventLog(req.OrderNo, op, "temp_store_failed", + "暂存退库失败(MES不可达) sn="+req.Sn+" stationNo="+itoa(req.StationNo)) + logx.Errorf("暂存退库上报失败(MES不可达): %v", err) + fail(w, http.StatusBadGateway, "MES 服务不可达,暂存未成功,请检查网络后重试") return } // 兜底:MES 以 HTTP200+code≠0 拒绝却未被 BizError 捕获(理论不可达),按拒绝处理 @@ -240,7 +218,7 @@ func tempStoreHandler(ctx *svc.ServiceContext) http.HandlerFunc { ctx.Store.AddEventLog(req.OrderNo, op, "temp_store", "暂存/退回库房 sn="+req.Sn+" stationNo="+itoa(req.StationNo)) - ok(w, map[string]any{"queued": false}) + ok(w, map[string]any{"ok": true}) } } diff --git a/bj_power_workstation/internal/handler/routes.go b/bj_power_workstation/internal/handler/routes.go index 2fc2a1c..22aac2e 100644 --- a/bj_power_workstation/internal/handler/routes.go +++ b/bj_power_workstation/internal/handler/routes.go @@ -46,7 +46,6 @@ func RegisterHandlers(server *rest.Server, ctx *svc.ServiceContext) { {Method: http.MethodGet, Path: "/api/station/state", Handler: stationStateHandler(ctx)}, {Method: http.MethodGet, Path: "/api/pdf", Handler: pdfQueryHandler(ctx)}, {Method: http.MethodGet, Path: "/pdfopen/:name", Handler: pdfOpenHandler(ctx)}, - {Method: http.MethodGet, Path: "/api/tightening/list", Handler: tighteningListHandler(ctx)}, {Method: http.MethodPost, Path: "/api/tightening/record", Handler: tighteningRecordHandler(ctx)}, {Method: http.MethodGet, Path: "/api/tightening/live", Handler: tighteningLiveHandler(ctx)}, {Method: http.MethodPost, Path: "/api/tightening/consume", Handler: tighteningConsumeHandler(ctx)}, @@ -55,9 +54,6 @@ func RegisterHandlers(server *rest.Server, ctx *svc.ServiceContext) { // 工件报废/人工取走(2026-11-03 补全):与暂存退库语义互斥,原因必填,不做离线排队 {Method: http.MethodPost, Path: "/api/report/scrap", Handler: scrapHandler(ctx)}, {Method: http.MethodPost, Path: "/api/station/logout", Handler: logoutHandler(ctx)}, - {Method: http.MethodPost, Path: "/api/sync/flush", Handler: syncFlushHandler(ctx)}, - {Method: http.MethodGet, Path: "/api/sync/stats", Handler: syncStatsHandler(ctx)}, - {Method: http.MethodPost, Path: "/api/sync/retry-queue", Handler: syncRetryQueueHandler(ctx)}, // 产线点位 / 叫料(代理 MES 内部 API) {Method: http.MethodGet, Path: "/api/line/points", Handler: linePointsHandler(ctx)}, diff --git a/bj_power_workstation/internal/handler/sync.go b/bj_power_workstation/internal/handler/sync.go deleted file mode 100644 index 281be4f..0000000 --- a/bj_power_workstation/internal/handler/sync.go +++ /dev/null @@ -1,101 +0,0 @@ -package handler - -import ( - "encoding/json" - "net/http" - - "bj_power_workstation/internal/svc" -) - -// syncFlushHandler POST /api/sync/flush 手动立即执行一轮同步,返回本次成功条数。 -func syncFlushHandler(ctx *svc.ServiceContext) http.HandlerFunc { - return func(w http.ResponseWriter, r *http.Request) { - count := ctx.Syncer.RunOnce(r.Context()) - ok(w, map[string]any{ - "count": count, - "message": "本轮同步完成", - }) - } -} - -// syncStatsHandler GET /api/sync/stats 返回「当前登录人」尚未成功上报的本地数据(失败列表), -// 供前端在「同一人重新登录」时仅展示失败信息(不自动打开页面)。他人数据不被返回、不可见。 -// queueDead=死信(MES 业务拒绝、待人工重传处理),与 queue(待自动重传)分开回报。 -func syncStatsHandler(ctx *svc.ServiceContext) http.HandlerFunc { - return func(w http.ResponseWriter, r *http.Request) { - if ss, err := ctx.Store.GetStationSession(); err != nil || ss == nil { - ok(w, map[string]any{"pendingTorque": 0, "pendingQueue": 0, "pendingTotal": 0, - "deadTotal": 0, "queue": []any{}, "queueDead": []any{}, "torque": []any{}}) - return - } else { - queue, _ := ctx.Store.PendingQueueItemsForOperator(ss.UserID, 200) - queueDead, _ := ctx.Store.DeadQueueItemsForOperator(ss.UserID, 200) - torque, _ := ctx.Store.PendingTorqueResultsForOperator(ss.UserID, 200) - ok(w, map[string]any{ - "pendingQueue": len(queue), - "pendingTorque": len(torque), - "pendingTotal": len(queue) + len(torque), - "queue": queue, - "queueDead": queueDead, - "deadTotal": len(queueDead), - "torque": torque, - }) - } - } -} - -// syncRetryQueueHandler POST /api/sync/retry-queue 人工重传处理: -// 操作工查看失败原因、重选空闲点位后再次提交。body {id, payload},payload 为修正后的完整 JSON body。 -// 处理:校验归属当前登录人(数据按操作人隔离)→ 写入修正 payload 并重置为待重传 → 立即按当前登录人身份发一轮 → -// 回报本轮结果(synced=已发送 / rejected=再次被拒(含原因) / retrying=网络失败,下轮继续)。 -func syncRetryQueueHandler(ctx *svc.ServiceContext) http.HandlerFunc { - return func(w http.ResponseWriter, r *http.Request) { - ss, err := ctx.Store.GetStationSession() - if err != nil || ss == nil || ss.Token == "" { - fail(w, http.StatusUnauthorized, "登录已失效,请重新登录后再重传") - return - } - var req struct { - ID int64 `json:"id"` - Payload json.RawMessage `json:"payload"` - } - if err := json.NewDecoder(r.Body).Decode(&req); err != nil || req.ID <= 0 { - fail(w, http.StatusBadRequest, "请求体解析失败") - return - } - if len(req.Payload) == 0 { - fail(w, http.StatusBadRequest, "缺少上报内容(payload)") - return - } - // 归属校验:只能重传自己的数据(他人数据不被代发、也不可见) - item, err := ctx.Store.QueueItemByID(req.ID) - if err != nil { - fail(w, http.StatusNotFound, "记录不存在或已处理") - return - } - if item.OperatorID != ss.UserID { - fail(w, http.StatusForbidden, "只能重传本人录入的数据") - return - } - // 写入修正 payload,重置为待重传(同步器按当前登录人身份发送) - if err := ctx.Store.ResetQueueForRetry(req.ID, string(req.Payload)); err != nil { - fail(w, http.StatusInternalServerError, "重置重传状态失败") - return - } - ctx.Syncer.RunOnce(r.Context()) - // 回报本轮结果 - after, err := ctx.Store.QueueItemByID(req.ID) - if err != nil { - ok(w, map[string]any{"status": "retrying", "message": "已提交重传,结果下轮同步后可见"}) - return - } - switch { - case after.Synced == 1: - ok(w, map[string]any{"status": "synced", "message": "重传成功,已上报 MES"}) - case after.Synced == 2: - ok(w, map[string]any{"status": "rejected", "message": after.LastError, "reason": after.LastError}) - default: - ok(w, map[string]any{"status": "retrying", "message": "MES 暂不可达,已留在队列等待下轮自动重传"}) - } - } -} diff --git a/bj_power_workstation/internal/handler/tightening.go b/bj_power_workstation/internal/handler/tightening.go index 22f3f60..32cb675 100644 --- a/bj_power_workstation/internal/handler/tightening.go +++ b/bj_power_workstation/internal/handler/tightening.go @@ -2,48 +2,24 @@ package handler import ( "encoding/json" + "errors" "fmt" "io" "net/http" "strconv" "strings" - "bj_power_workstation/internal/store" + "bj_power_workstation/internal/mes" "bj_power_workstation/internal/svc" + + "github.com/zeromicro/go-zero/core/logx" ) -// tighteningListHandler GET /api/tightening/list?sn=&only_pending=true&limit=100 -// 查询本地 torque_results(最新优先)。 -func tighteningListHandler(ctx *svc.ServiceContext) http.HandlerFunc { - return func(w http.ResponseWriter, r *http.Request) { - q := r.URL.Query() - sn := q.Get("sn") - - onlyPending := false - if v, err := strconv.ParseBool(q.Get("only_pending")); err == nil { - onlyPending = v - } - - limit := atoi(q.Get("limit"), 100) - if limit <= 0 || limit > 500 { - limit = 500 - } - - list, err := ctx.Store.ListTorqueResults(sn, onlyPending, limit) - if err != nil { - fail(w, http.StatusInternalServerError, "查询拧紧结果失败:"+err.Error()) - return - } - ok(w, map[string]any{ - "total": len(list), - "list": list, - }) - } -} - // tighteningRecordHandler POST /api/tightening/record —— 录入一条拧紧数据。 // 真实场景:工件走到「需要拧紧枪」的工艺步骤时界面聚焦拧紧输入框,人工操作拧紧枪把采集到的 -// 扭矩值打入输入框回车 → 本接口按当前工件 SN + 工艺步骤落本地库,再由后台同步器上报 MES。 +// 扭矩值打入输入框回车 → 本接口实时直连 MES /api/internal/torque/report 上报。 +// 2026-11-05 拍板:断网即失败(无本地缓存/离线队列/自动重试),操作失败工人重做即可; +// 本地仅记操作日志(审计),不再落 torque_results 表。 // 入参 {sn, workOrderNo, stepId, stepName, screwNo, torque, angle, result, operator}; // result 由前端按该步骤考核标准(扭矩 RANGE)判定后传入,非 NG 一律记 OK。 func tighteningRecordHandler(ctx *svc.ServiceContext) http.HandlerFunc { @@ -85,33 +61,44 @@ func tighteningRecordHandler(ctx *svc.ServiceContext) http.HandlerFunc { if ss != nil && ss.Name != "" { op = ss.Name } - opID := int64(0) - if ss != nil { - opID = ss.UserID - } - // 拧紧域工位标签载体(自洽闭环):写入 DOCK%02d、syncer 上报前同公式反推工位号—— - // 与接驳台 dock 表编码无关,接驳台左右互换(side 字段)不影响本数据流。 + // 拧紧域工位标签载体:DOCK%02d 由本机固定工位号生成(与接驳台 dock 表编码无关), + // MES 侧按 stationNo(数字工位号)落库并做应拧/实拧分组统计。 dockCode := fmt.Sprintf("DOCK%02d", ctx.Config.Station.StationNo) - id, err := ctx.Store.InsertTorqueResult(store.TorqueResult{ - WorkOrderNo: req.WorkOrderNo, - Sn: req.Sn, - DockCode: dockCode, - ScrewNo: req.ScrewNo, - StepId: req.StepId, - StepName: req.StepName, - Torque: req.Torque, - Angle: req.Angle, - Result: req.Result, - Operator: op, - OperatorID: opID, - }) - if err != nil { - fail(w, http.StatusInternalServerError, "拧紧数据入库失败:"+err.Error()) + body := map[string]any{ + "workOrderNo": req.WorkOrderNo, + "sn": req.Sn, + "dockCode": dockCode, + "stationNo": strconv.Itoa(ctx.Config.Station.StationNo), + "screwNo": req.ScrewNo, + "stepId": req.StepId, + "stepName": req.StepName, + "torque": req.Torque, + "angle": req.Angle, + "result": req.Result, + "operator": op, + } + if _, _, err := ctx.Mes.Post("/api/internal/torque/report", body); err != nil { + var bizErr *mes.BizError + if errors.As(err, &bizErr) { + msg := mesRespCode(bizErr.Body) + if msg == "" { + msg = bizErr.Error() + } + ctx.Store.AddEventLog(req.WorkOrderNo, op, "torque_record_rejected", + fmt.Sprintf("拧紧录入被MES拒绝 sn=%s 步骤=%s:%s", req.Sn, req.StepName, msg)) + fail(w, http.StatusConflict, msg) + return + } + // 网络失败:直接报错(2026-11-05 拍板:断网即失败,无本地缓存/自动重试,工人重做即可) + ctx.Store.AddEventLog(req.WorkOrderNo, op, "torque_record_failed", + fmt.Sprintf("拧紧录入失败(MES不可达) sn=%s 步骤=%s 扭矩=%.1f", req.Sn, req.StepName, req.Torque)) + logx.Errorf("拧紧录入上报失败(MES不可达): %v", err) + fail(w, http.StatusBadGateway, "MES 服务不可达,拧紧数据未保存,请检查网络后重新录入") return } ctx.Store.AddEventLog(req.WorkOrderNo, op, "torque_record", fmt.Sprintf("拧紧录入 sn=%s 步骤=%s 扭矩=%.1f 结果=%s", req.Sn, req.StepName, req.Torque, req.Result)) - ok(w, map[string]any{"id": id, "result": req.Result}) + ok(w, map[string]any{"result": req.Result}) } } diff --git a/bj_power_workstation/internal/handler/workpiece.go b/bj_power_workstation/internal/handler/workpiece.go index 5a9abe3..db0e312 100644 --- a/bj_power_workstation/internal/handler/workpiece.go +++ b/bj_power_workstation/internal/handler/workpiece.go @@ -116,15 +116,10 @@ func onlineHandler(ctx *svc.ServiceContext) http.HandlerFunc { fail(w, http.StatusBadRequest, "缺少 sn") return } - ctx.Syncer.RunOnce(r.Context()) - // 录入时操作人(当前登录人),供离线队列按操作人隔离发送 - opID := int64(0) + // 操作人取工位登录态可信身份(防冒名),仅用于本地操作日志落痕 opName := req.Operator - if ss, sErr := ctx.Store.GetStationSession(); sErr == nil && ss != nil { - opID = ss.UserID - if ss.Name != "" { - opName = ss.Name - } + if ss, sErr := ctx.Store.GetStationSession(); sErr == nil && ss != nil && ss.Name != "" { + opName = ss.Name } q := url.Values{} if req.Operator != "" { @@ -132,7 +127,7 @@ func onlineHandler(ctx *svc.ServiceContext) http.HandlerFunc { } respBody, _, err := ctx.Mes.Post("/api/internal/workpiece/online?"+q.Encode(), json.RawMessage(payload)) if err != nil { - // MES 业务拒绝(HTTP200+code≠0):数据不合法重传不可能成功,直接失败回前端不入队 + // MES 业务拒绝(HTTP200+code≠0):数据不合法,直接失败回前端 var bizErr *mes.BizError if errors.As(err, &bizErr) { msg := mesRespCode(bizErr.Body) @@ -141,17 +136,14 @@ func onlineHandler(ctx *svc.ServiceContext) http.HandlerFunc { } ctx.Store.AddEventLog(req.OrderNo, opName, "online_register_rejected", "上线建档被MES拒绝 sn="+req.Sn+":"+msg) - logx.Errorf("上线建档被 MES 拒绝(不入队): %s", msg) + logx.Errorf("上线建档被 MES 拒绝: %s", msg) fail(w, http.StatusConflict, msg) return } - if qerr := ctx.Store.InsertQueueItem("online_register", string(payload), opID, opName); qerr != nil { - fail(w, http.StatusInternalServerError, "上报失败且离线队列写入失败:"+qerr.Error()) - return - } - ctx.Store.AddEventLog(req.OrderNo, opName, "online_register_queued", "上线建档离线排队 sn="+req.Sn) - logx.Errorf("上线建档失败已离线排队: %v", err) - ok(w, map[string]any{"queued": true}) + // 网络失败:直接报错(2026-11-05 拍板:断网即失败,无离线队列/自动重试,工人重做即可) + ctx.Store.AddEventLog(req.OrderNo, opName, "online_register_failed", "上线建档失败(MES不可达) sn="+req.Sn) + logx.Errorf("上线建档失败(MES不可达): %v", err) + fail(w, http.StatusBadGateway, "MES 服务不可达,建档未成功,请检查网络后重试") return } if msg := mesRespCode(respBody); msg != "" { @@ -162,7 +154,7 @@ func onlineHandler(ctx *svc.ServiceContext) http.HandlerFunc { } ctx.Store.AddEventLog(req.OrderNo, opName, "online_register", "上线建档 sn="+req.Sn) // 透传 MES 响应(data 即 PLC↔MES 对账 mismatch 对象,无对账时为 null), - // 供前端建档成功后按需弹「两项」提示;离线队列分支仍返回 {queued:true}。 + // 供前端建档成功后按需弹「两项」提示。 passJSON(w, respBody) } } @@ -186,15 +178,10 @@ func doneHandler(ctx *svc.ServiceContext) http.HandlerFunc { fail(w, http.StatusBadRequest, "缺少 sn") return } - ctx.Syncer.RunOnce(r.Context()) - // 录入时操作人(当前登录人),供离线队列按操作人隔离发送 - opID := int64(0) + // 操作人取工位登录态可信身份(防冒名),仅用于本地操作日志落痕 opName := req.Operator - if ss, sErr := ctx.Store.GetStationSession(); sErr == nil && ss != nil { - opID = ss.UserID - if ss.Name != "" { - opName = ss.Name - } + if ss, sErr := ctx.Store.GetStationSession(); sErr == nil && ss != nil && ss.Name != "" { + opName = ss.Name } q := url.Values{} if req.Operator != "" { @@ -202,7 +189,7 @@ func doneHandler(ctx *svc.ServiceContext) http.HandlerFunc { } respBody, _, err := ctx.Mes.Post("/api/internal/workpiece/done?"+q.Encode(), json.RawMessage(payload)) if err != nil { - // MES 业务拒绝(HTTP200+code≠0):数据不合法重传不可能成功,直接失败回前端不入队 + // MES 业务拒绝(HTTP200+code≠0):数据不合法,直接失败回前端 var bizErr *mes.BizError if errors.As(err, &bizErr) { msg := mesRespCode(bizErr.Body) @@ -210,17 +197,14 @@ func doneHandler(ctx *svc.ServiceContext) http.HandlerFunc { msg = bizErr.Error() } ctx.Store.AddEventLog("", opName, "offline_finish_rejected", "下线完工被MES拒绝 sn="+req.Sn+":"+msg) - logx.Errorf("下线完工被 MES 拒绝(不入队): %s", msg) + logx.Errorf("下线完工被 MES 拒绝: %s", msg) fail(w, http.StatusConflict, msg) return } - if qerr := ctx.Store.InsertQueueItem("offline_finish", string(payload), opID, opName); qerr != nil { - fail(w, http.StatusInternalServerError, "上报失败且离线队列写入失败:"+qerr.Error()) - return - } - ctx.Store.AddEventLog("", opName, "offline_finish_queued", "下线完工离线排队 sn="+req.Sn) - logx.Errorf("下线完工上报失败已离线排队: %v", err) - ok(w, map[string]any{"queued": true}) + // 网络失败:直接报错(2026-11-05 拍板:断网即失败,无离线队列/自动重试,工人重做即可) + ctx.Store.AddEventLog("", opName, "offline_finish_failed", "下线完工失败(MES不可达) sn="+req.Sn) + logx.Errorf("下线完工失败(MES不可达): %v", err) + fail(w, http.StatusBadGateway, "MES 服务不可达,完工未成功,请检查网络后重试") return } if msg := mesRespCode(respBody); msg != "" { @@ -229,6 +213,6 @@ func doneHandler(ctx *svc.ServiceContext) http.HandlerFunc { return } ctx.Store.AddEventLog("", opName, "offline_finish", "下线完工入库 sn="+req.Sn) - ok(w, map[string]any{"queued": false}) + ok(w, map[string]any{"ok": true}) } } diff --git a/bj_power_workstation/internal/mes/client.go b/bj_power_workstation/internal/mes/client.go index b4938d7..dabc087 100644 --- a/bj_power_workstation/internal/mes/client.go +++ b/bj_power_workstation/internal/mes/client.go @@ -14,12 +14,11 @@ import ( ) // ErrAuth 认证失效(401 / 登录态过期):可恢复错误。 -// 调用方(离线 syncer)据此跳过该条,数据留在本地 SQLite,待同一操作人重新登录后继续发送。 +// 调用方据此提示重新登录(2026-11-05 拍板:断网/认证失败直接报错,无离线重试)。 var ErrAuth = errors.New("station auth expired or invalid") // BizError MES 业务拒绝(HTTP 2xx + code≠0):请求已送达且被明确拒绝,数据本身不合法, -// 原样重传不可能成功。调用方应把拒绝原因直接回前端(不写离线队列); -// 离线 syncer 据此把队列条目标记死信(synced=2),停止自动重传,保留记录供人工排查。 +// 调用方应把拒绝原因直接回前端。 type BizError struct { Body []byte // MES 原始响应体 Code int // 业务码 @@ -55,7 +54,6 @@ func New(baseURL, token string) *Client { // SetStationToken 设置工位登录态 JWT(方案 B):登录成功后由上层注入, // 后续报工/拧紧调用将以 Authorization: Bearer 携带,供 MES 校验可信操作人。 -// 重新登录即清除 stale(若有),使离线 syncer 恢复重传。 func (c *Client) SetStationToken(t string) { c.mu.Lock() c.stationToken = t @@ -144,8 +142,7 @@ func (c *Client) do(method, u string, body io.Reader) ([]byte, http.Header, erro return nil, resp.Header, err } if resp.StatusCode == http.StatusUnauthorized { - // 401 = 工位登录态过期/无效,属可恢复错误: - // 调用方(syncer)据此跳过该条,数据留在本地,待同一操作人重新登录后继续发送。 + // 401 = 工位登录态过期/无效:调用方据此提示重新登录。 return respBody, resp.Header, fmt.Errorf("MES %s %s: %w", method, u, ErrAuth) } if resp.StatusCode < 200 || resp.StatusCode > 299 { diff --git a/bj_power_workstation/internal/store/store.go b/bj_power_workstation/internal/store/store.go index beee08d..e8606a4 100644 --- a/bj_power_workstation/internal/store/store.go +++ b/bj_power_workstation/internal/store/store.go @@ -3,13 +3,14 @@ package store import ( "database/sql" "fmt" - "strings" "time" _ "modernc.org/sqlite" // 纯 Go SQLite 驱动(驱动名 "sqlite"),避免 CGO ) -// Store 本地 SQLite 缓存库封装(拧紧结果 + 上报队列 + 操作日志 + 内置账号)。 +// Store 本地 SQLite 封装(操作日志 + 内置账号 + 登录态)。 +// 2026-11-05 拍板:断网即失败,无离线队列/自动重试——原 torque_results/report_queue +// 两表已废弃(清理 SQL:migrations/20261105_drop_offline_queue.sql,部署时手工执行)。 type Store struct { db *sql.DB } @@ -23,36 +24,6 @@ CREATE TABLE IF NOT EXISTS users ( role TEXT NOT NULL DEFAULT 'operator' ); -CREATE TABLE IF NOT EXISTS torque_results ( - id INTEGER PRIMARY KEY AUTOINCREMENT, - work_order_no TEXT, - sn TEXT, - dock_code TEXT, - screw_no TEXT, - step_id TEXT, - step_name TEXT, - torque REAL, - angle REAL, - result TEXT, - operator TEXT, - operator_id INTEGER, -- 录入时操作人 ID(当前登录人),按操作人隔离发送 - synced INTEGER DEFAULT 0, - retry_count INTEGER DEFAULT 0, - created_at INTEGER -); - -CREATE TABLE IF NOT EXISTS report_queue ( - id INTEGER PRIMARY KEY AUTOINCREMENT, - kind TEXT, -- process_done | temp_store | online_register | offline_finish - payload TEXT, -- 待透传给 MES 的 JSON body - operator_id INTEGER, -- 录入时操作人 ID(当前登录人),按操作人隔离发送 - operator_name TEXT, -- 录入时操作人姓名(本地追溯用) - last_error TEXT, -- 最近一次失败原因(MES 业务拒绝文案,供人工重传处理查看) - synced INTEGER DEFAULT 0, -- 0=待重传 1=已同步 2=死信(待人工处理) - retry_count INTEGER DEFAULT 0, - created_at INTEGER -); - -- 操作日志(可追溯):含工单号与操作人 CREATE TABLE IF NOT EXISTS event_log ( id INTEGER PRIMARY KEY AUTOINCREMENT, @@ -104,26 +75,6 @@ func Open(path string) (*Store, error) { db.Close() return nil, err } - if err := s.migrateTorqueStep(); err != nil { - db.Close() - return nil, err - } - if err := s.migrateQueueOp(); err != nil { - db.Close() - return nil, err - } - if err := s.migrateQueueLastError(); err != nil { - db.Close() - return nil, err - } - if err := s.migrateTorqueRetry(); err != nil { - db.Close() - return nil, err - } - if err := s.migrateTorqueOp(); err != nil { - db.Close() - return nil, err - } if err := s.migrateStationSession(); err != nil { db.Close() return nil, err @@ -187,73 +138,6 @@ func (s *Store) migrateStationSessionUser() error { return err } -// migrateQueueOp 兼容旧库:上报队列身份列(operator_id/operator_name)为按操作人隔离新增,缺失时自动补齐。 -func (s *Store) migrateQueueOp() error { - for _, col := range []struct{ name, ddl string }{ - {"operator_id", `ALTER TABLE report_queue ADD COLUMN operator_id INTEGER`}, - {"operator_name", `ALTER TABLE report_queue ADD COLUMN operator_name TEXT`}, - } { - rows, err := s.db.Query(`SELECT name FROM pragma_table_info('report_queue') WHERE name=?`, col.name) - if err != nil { - return err - } - exists := rows.Next() - rows.Close() - if exists { - continue - } - if _, err := s.db.Exec(col.ddl); err != nil { - return err - } - } - return nil -} - -// migrateQueueLastError 兼容旧库:上报队列失败原因列(last_error)为重传处理新增,缺失时自动补齐。 -func (s *Store) migrateQueueLastError() error { - rows, err := s.db.Query(`SELECT name FROM pragma_table_info('report_queue') WHERE name='last_error'`) - if err != nil { - return err - } - exists := rows.Next() - rows.Close() - if exists { - return nil - } - _, err = s.db.Exec(`ALTER TABLE report_queue ADD COLUMN last_error TEXT`) - return err -} - -// migrateTorqueRetry 兼容旧库:拧紧结果重试计数(retry_count)为后续补充字段,缺失时自动补齐。 -func (s *Store) migrateTorqueRetry() error { - rows, err := s.db.Query(`SELECT name FROM pragma_table_info('torque_results') WHERE name='retry_count'`) - if err != nil { - return err - } - exists := rows.Next() - rows.Close() - if exists { - return nil - } - _, err = s.db.Exec(`ALTER TABLE torque_results ADD COLUMN retry_count INTEGER DEFAULT 0`) - return err -} - -// migrateTorqueOp 兼容旧库:拧紧结果操作人列(operator_id)为按操作人隔离新增,缺失时自动补齐。 -func (s *Store) migrateTorqueOp() error { - rows, err := s.db.Query(`SELECT name FROM pragma_table_info('torque_results') WHERE name='operator_id'`) - if err != nil { - return err - } - exists := rows.Next() - rows.Close() - if exists { - return nil - } - _, err = s.db.Exec(`ALTER TABLE torque_results ADD COLUMN operator_id INTEGER`) - return err -} - // StationSession 工位终端当前登录态(方案 B 可信身份锚点)。 type StationSession struct { Token string // MES 签发的登录 JWT(Bearer 凭证) @@ -346,29 +230,6 @@ func (s *Store) migrateUsersRole() error { return err } -// migrateTorqueStep 兼容旧库:拧紧结果关联工艺步骤(step_id/step_name)为后续补充字段,缺失时自动补齐。 -func (s *Store) migrateTorqueStep() error { - cols := []struct{ name, ddl string }{ - {"step_id", `ALTER TABLE torque_results ADD COLUMN step_id TEXT`}, - {"step_name", `ALTER TABLE torque_results ADD COLUMN step_name TEXT`}, - } - for _, col := range cols { - rows, err := s.db.Query(`SELECT name FROM pragma_table_info('torque_results') WHERE name=?`, col.name) - if err != nil { - return err - } - exists := rows.Next() - rows.Close() - if exists { - continue - } - if _, err := s.db.Exec(col.ddl); err != nil { - return err - } - } - return nil -} - func (s *Store) Close() error { return s.db.Close() } // Ping 健康检查用。 @@ -413,315 +274,6 @@ func (s *Store) GetUserByUsername(username string) (*User, error) { return &u, nil } -// ---------- 拧紧结果 ---------- - -type TorqueResult struct { - ID int64 `json:"id"` - WorkOrderNo string `json:"workOrderNo"` - Sn string `json:"sn"` - DockCode string `json:"dockCode"` - ScrewNo string `json:"screwNo"` - StepId string `json:"stepId"` // 关联的拧紧工艺步骤ID - StepName string `json:"stepName"` // 拧紧工艺步骤名 - Torque float64 `json:"torque"` - Angle float64 `json:"angle"` - Result string `json:"result"` // OK | NG - Operator string `json:"operator"` - OperatorID int64 `json:"operatorId"` // 录入时操作人 ID(当前登录人),按操作人隔离发送 - Synced bool `json:"synced"` - Dead bool `json:"dead"` // 死信(synced=2):MES 业务拒绝、停止重传,前端可提示人工排查 - RetryCount int64 `json:"retryCount"` // 上报失败累计次数 - CreatedAt int64 `json:"createdAt"` // 毫秒时间戳 -} - -func (s *Store) InsertTorqueResult(t TorqueResult) (int64, error) { - res, err := s.db.Exec( - `INSERT INTO torque_results(work_order_no, sn, dock_code, screw_no, step_id, step_name, torque, angle, result, operator, operator_id, synced, created_at) - VALUES(?,?,?,?,?,?,?,?,?,?,?,0,?)`, - t.WorkOrderNo, t.Sn, t.DockCode, t.ScrewNo, t.StepId, t.StepName, t.Torque, t.Angle, t.Result, t.Operator, t.OperatorID, time.Now().Unix(), - ) - if err != nil { - return 0, err - } - return res.LastInsertId() -} - -// ListTorqueResults 查询本地拧紧结果,最新优先;sn 为空查全部,onlyPending 仅查未同步。 -func (s *Store) ListTorqueResults(sn string, onlyPending bool, limit int) ([]TorqueResult, error) { - query := `SELECT id, work_order_no, sn, dock_code, screw_no, COALESCE(step_id,''), COALESCE(step_name,''), torque, angle, result, operator, COALESCE(operator_id,0), synced, COALESCE(retry_count,0), created_at FROM torque_results` - var conds []string - var args []any - if sn != "" { - conds = append(conds, "sn = ?") - args = append(args, sn) - } - if onlyPending { - conds = append(conds, "synced = 0") - } - if len(conds) > 0 { - query += " WHERE " + strings.Join(conds, " AND ") - } - query += ` ORDER BY id DESC LIMIT ?` - args = append(args, limit) - - rows, err := s.db.Query(query, args...) - if err != nil { - return nil, err - } - defer rows.Close() - - list := make([]TorqueResult, 0) - for rows.Next() { - var t TorqueResult - var synced int64 - var createdAt int64 - if err := rows.Scan(&t.ID, &t.WorkOrderNo, &t.Sn, &t.DockCode, &t.ScrewNo, - &t.StepId, &t.StepName, &t.Torque, &t.Angle, &t.Result, &t.Operator, &t.OperatorID, &synced, &t.RetryCount, &createdAt); err != nil { - return nil, err - } - t.Synced = synced == 1 - t.Dead = synced == 2 - t.CreatedAt = createdAt * 1000 // 秒 → 毫秒 - list = append(list, t) - } - return list, rows.Err() -} - -// PendingTorqueResultsForOperator 仅返回指定操作人自己的未同步拧紧结果(按操作人隔离发送)。 -func (s *Store) PendingTorqueResultsForOperator(opID int64, limit int) ([]TorqueResult, error) { - rows, err := s.db.Query( - `SELECT id, work_order_no, sn, dock_code, screw_no, COALESCE(step_id,''), COALESCE(step_name,''), torque, angle, result, operator, COALESCE(operator_id,0), synced, COALESCE(retry_count,0), created_at FROM torque_results WHERE synced=0 AND operator_id=? ORDER BY id ASC LIMIT ?`, - opID, limit, - ) - if err != nil { - return nil, err - } - defer rows.Close() - - list := make([]TorqueResult, 0) - for rows.Next() { - var t TorqueResult - var synced int64 - var createdAt int64 - if err := rows.Scan(&t.ID, &t.WorkOrderNo, &t.Sn, &t.DockCode, &t.ScrewNo, - &t.StepId, &t.StepName, &t.Torque, &t.Angle, &t.Result, &t.Operator, &t.OperatorID, &synced, &t.RetryCount, &createdAt); err != nil { - return nil, err - } - t.Synced = synced == 1 - t.Dead = synced == 2 - t.CreatedAt = createdAt * 1000 - list = append(list, t) - } - return list, rows.Err() -} - -func (s *Store) MarkTorqueSynced(ids []int64) error { - tx, err := s.db.Begin() - if err != nil { - return err - } - for _, id := range ids { - if _, err := tx.Exec(`UPDATE torque_results SET synced=1 WHERE id=?`, id); err != nil { - tx.Rollback() - return err - } - } - return tx.Commit() -} - -func (s *Store) PendingTorqueCount() (int64, error) { - var n int64 - err := s.db.QueryRow(`SELECT COUNT(*) FROM torque_results WHERE synced=0`).Scan(&n) - return n, err -} - -// ---------- 上报队列 ---------- - -type QueueItem struct { - ID int64 - Kind string // process_done | temp_store | online_register | offline_finish - Payload string - OperatorID int64 // 录入时操作人 ID(当前登录人),按操作人隔离发送 - OperatorName string // 录入时操作人姓名(本地追溯用) - LastError string // 最近一次失败原因(MES 业务拒绝文案,供人工重传处理查看) - Synced int // 0=待重传 1=已同步 2=死信(待人工处理) - RetryCount int - CreatedAt int64 -} - -// InsertQueueItem 写入一条离线队列,记录录入时操作人 ID/姓名(当前登录人), -// 供后台同步器按操作人隔离发送(仅当前登录人自己的数据被发送,他人数据不被代发)。 -func (s *Store) InsertQueueItem(kind, payload string, opID int64, opName string) error { - _, err := s.db.Exec( - `INSERT INTO report_queue(kind, payload, operator_id, operator_name, synced, retry_count, created_at) VALUES(?,?,?,?,0,0,?)`, - kind, payload, opID, opName, time.Now().Unix(), - ) - return err -} - -// PendingQueueItems 返回全部未同步队列项(不分操作人,用于全局积压统计)。 -func (s *Store) PendingQueueItems(limit int) ([]QueueItem, error) { - rows, err := s.db.Query( - `SELECT id, kind, payload, COALESCE(operator_id,0), COALESCE(operator_name,''), COALESCE(last_error,''), retry_count, created_at FROM report_queue WHERE synced=0 ORDER BY id ASC LIMIT ?`, - limit, - ) - if err != nil { - return nil, err - } - defer rows.Close() - - list := make([]QueueItem, 0) - for rows.Next() { - var it QueueItem - if err := rows.Scan(&it.ID, &it.Kind, &it.Payload, &it.OperatorID, &it.OperatorName, &it.LastError, &it.RetryCount, &it.CreatedAt); err != nil { - return nil, err - } - list = append(list, it) - } - return list, rows.Err() -} - -// PendingQueueItemsForOperator 仅返回指定操作人自己的未同步队列项(按操作人隔离发送)。 -func (s *Store) PendingQueueItemsForOperator(opID int64, limit int) ([]QueueItem, error) { - rows, err := s.db.Query( - `SELECT id, kind, payload, COALESCE(operator_id,0), COALESCE(operator_name,''), COALESCE(last_error,''), retry_count, created_at FROM report_queue WHERE synced=0 AND operator_id=? ORDER BY id ASC LIMIT ?`, - opID, limit, - ) - if err != nil { - return nil, err - } - defer rows.Close() - - list := make([]QueueItem, 0) - for rows.Next() { - var it QueueItem - if err := rows.Scan(&it.ID, &it.Kind, &it.Payload, &it.OperatorID, &it.OperatorName, &it.LastError, &it.RetryCount, &it.CreatedAt); err != nil { - return nil, err - } - list = append(list, it) - } - return list, rows.Err() -} - -// QueueItemByID 按 ID 查询单条队列项(重传处理后回报本轮发送结果用)。 -func (s *Store) QueueItemByID(id int64) (*QueueItem, error) { - row := s.db.QueryRow( - `SELECT id, kind, payload, COALESCE(operator_id,0), COALESCE(operator_name,''), COALESCE(last_error,''), synced, retry_count, created_at FROM report_queue WHERE id=?`, - id, - ) - var it QueueItem - if err := row.Scan(&it.ID, &it.Kind, &it.Payload, &it.OperatorID, &it.OperatorName, &it.LastError, &it.Synced, &it.RetryCount, &it.CreatedAt); err != nil { - return nil, err - } - return &it, nil -} - -// DeadQueueItemsForOperator 返回指定操作人自己的死信队列项(synced=2,MES 业务拒绝、待人工重传处理)。 -func (s *Store) DeadQueueItemsForOperator(opID int64, limit int) ([]QueueItem, error) { - rows, err := s.db.Query( - `SELECT id, kind, payload, COALESCE(operator_id,0), COALESCE(operator_name,''), COALESCE(last_error,''), synced, retry_count, created_at FROM report_queue WHERE synced=2 AND operator_id=? ORDER BY id ASC LIMIT ?`, - opID, limit, - ) - if err != nil { - return nil, err - } - defer rows.Close() - - list := make([]QueueItem, 0) - for rows.Next() { - var it QueueItem - if err := rows.Scan(&it.ID, &it.Kind, &it.Payload, &it.OperatorID, &it.OperatorName, &it.LastError, &it.Synced, &it.RetryCount, &it.CreatedAt); err != nil { - return nil, err - } - list = append(list, it) - } - return list, rows.Err() -} - -func (s *Store) MarkQueueSynced(id int64) error { - _, err := s.db.Exec(`UPDATE report_queue SET synced=1 WHERE id=?`, id) - return err -} - -// MarkQueueDead 标记队列条目为死信(synced=2):MES 业务拒绝(HTTP 2xx+code≠0)说明 -// 数据本身不合法,原样重传不可能成功;停止自动重传,保留记录+失败原因供人工重传处理。 -func (s *Store) MarkQueueDead(id int64, reason string) error { - _, err := s.db.Exec(`UPDATE report_queue SET synced=2, last_error=? WHERE id=?`, reason, id) - return err -} - -// ResetQueueForRetry 人工重传处理:写入修正后的 payload(如重选的点位), -// 重置为待重传(synced=0)、清空重试计数与失败原因,由同步器按当前登录人身份下一轮发出。 -func (s *Store) ResetQueueForRetry(id int64, payload string) error { - _, err := s.db.Exec( - `UPDATE report_queue SET payload=?, synced=0, retry_count=0, last_error=NULL WHERE id=?`, - payload, id, - ) - return err -} - -// MarkTorqueDead 标记拧紧结果为死信(synced=2):同 MarkQueueDead,MES 业务拒绝后不再重传。 -func (s *Store) MarkTorqueDead(id int64) error { - _, err := s.db.Exec(`UPDATE torque_results SET synced=2 WHERE id=?`, id) - return err -} - -// BumpQueueRetry 失败累计重试次数(synced 保持 0)。 -func (s *Store) BumpQueueRetry(id int64) error { - _, err := s.db.Exec(`UPDATE report_queue SET retry_count=retry_count+1 WHERE id=?`, id) - return err -} - -// BumpTorqueRetry 失败累计重试次数(synced 保持 0)。 -func (s *Store) BumpTorqueRetry(id int64) error { - _, err := s.db.Exec(`UPDATE torque_results SET retry_count=retry_count+1 WHERE id=?`, id) - return err -} - -func (s *Store) PendingQueueCount() (int64, error) { - var n int64 - err := s.db.QueryRow(`SELECT COUNT(*) FROM report_queue WHERE synced=0`).Scan(&n) - return n, err -} - -// PendingQueueCountForOperator 返回指定操作人自己的未同步队列条数(退出登录提醒用)。 -func (s *Store) PendingQueueCountForOperator(opID int64) (int64, error) { - var n int64 - err := s.db.QueryRow(`SELECT COUNT(*) FROM report_queue WHERE synced=0 AND operator_id=?`, opID).Scan(&n) - return n, err -} - -// DeadQueueCountForOperator 返回指定操作人自己的死信队列条数(synced=2,待人工重传处理)。 -func (s *Store) DeadQueueCountForOperator(opID int64) (int64, error) { - var n int64 - err := s.db.QueryRow(`SELECT COUNT(*) FROM report_queue WHERE synced=2 AND operator_id=?`, opID).Scan(&n) - return n, err -} - -// PendingTorqueCountForOperator 返回指定操作人自己的未同步拧紧结果条数(退出登录提醒用)。 -func (s *Store) PendingTorqueCountForOperator(opID int64) (int64, error) { - var n int64 - err := s.db.QueryRow(`SELECT COUNT(*) FROM torque_results WHERE synced=0 AND operator_id=?`, opID).Scan(&n) - return n, err -} - -// CleanupOld 清理超过 maxAgeSec 秒的本地记录(队列+拧紧),用于「保留 1 个月」的本地留存策略; -// 同步成功与否均清理,超时数据由人工在 MES 侧追溯,本地不再保留。 -func (s *Store) CleanupOld(maxAgeSec int64) (int64, error) { - cutoff := time.Now().Unix() - maxAgeSec - res, err := s.db.Exec(`DELETE FROM report_queue WHERE created_at < ?`, cutoff) - if err != nil { - return 0, err - } - n1, _ := res.RowsAffected() - res2, err := s.db.Exec(`DELETE FROM torque_results WHERE created_at < ?`, cutoff) - if err != nil { - return n1, err - } - n2, _ := res2.RowsAffected() - return n1 + n2, nil -} - // ---------- 操作日志 ---------- // AddEventLog 记录一条操作日志(含工单号与操作人),用于追溯。 diff --git a/bj_power_workstation/internal/store/store_migrate_test.go b/bj_power_workstation/internal/store/store_migrate_test.go deleted file mode 100644 index 924bc98..0000000 --- a/bj_power_workstation/internal/store/store_migrate_test.go +++ /dev/null @@ -1,73 +0,0 @@ -package store_test - -import ( - "database/sql" - "testing" - - _ "modernc.org/sqlite" - - "bj_power_workstation/internal/store" -) - -// TestOldDBMigration 运行期验证旧库自动迁移:以「快照/隔离机制上线前」的真实旧 schema -// 建库(无 operator_id/operator_name/retry_count/station_session 等),store.Open 后 -// 所有迁移自动补齐,按操作人隔离的查询与登录态读写全部可用。 -func TestOldDBMigration(t *testing.T) { - path := t.TempDir() + "/old.db" - - // 直接以旧 schema 建库,模拟历史存量库 - old, err := sql.Open("sqlite", path) - if err != nil { - t.Fatal(err) - } - oldSQL := ` -CREATE TABLE users (id INTEGER PRIMARY KEY AUTOINCREMENT, username TEXT UNIQUE, password_hash TEXT, real_name TEXT, role TEXT NOT NULL DEFAULT 'operator'); -CREATE TABLE torque_results (id INTEGER PRIMARY KEY AUTOINCREMENT, work_order_no TEXT, sn TEXT, dock_code TEXT, screw_no TEXT, step_id TEXT, step_name TEXT, torque REAL, angle REAL, result TEXT, operator TEXT, synced INTEGER DEFAULT 0, created_at INTEGER); -CREATE TABLE report_queue (id INTEGER PRIMARY KEY AUTOINCREMENT, kind TEXT, payload TEXT, synced INTEGER DEFAULT 0, retry_count INTEGER DEFAULT 0, created_at INTEGER); -CREATE TABLE event_log (id INTEGER PRIMARY KEY AUTOINCREMENT, work_order_no TEXT, operator TEXT, action TEXT, detail TEXT, created_at INTEGER); -` - if _, err := old.Exec(oldSQL); err != nil { - t.Fatal(err) - } - _ = old.Close() - - // 重新 Open:迁移应把旧库补齐到当前 schema - st, err := store.Open(path) - if err != nil { - t.Fatalf("旧库迁移失败: %v", err) - } - defer st.Close() - - // 1) 拧紧结果:operator_id 可写可按人查 - if _, err := st.InsertTorqueResult(store.TorqueResult{ - WorkOrderNo: "WO-1", Sn: "SN-1", DockCode: "DOCK01", ScrewNo: "S1", - Torque: 10, Angle: 90, Result: "OK", Operator: "张三", OperatorID: 7, - }); err != nil { - t.Fatalf("[旧库] 拧紧结果写入失败(缺 operator_id 列?): %v", err) - } - rows, err := st.PendingTorqueResultsForOperator(7, 10) - if err != nil || len(rows) != 1 { - t.Fatalf("[旧库] 按操作人查拧紧结果应得 1 条,err=%v len=%d", err, len(rows)) - } - - // 2) 离线队列:operator_id/operator_name 可写可按人查 - if err := st.InsertQueueItem("process_done", `{"sn":"SN-1"}`, 7, "张三"); err != nil { - t.Fatalf("[旧库] 队列写入失败(缺 operator 列?): %v", err) - } - items, err := st.PendingQueueItemsForOperator(7, 10) - if err != nil || len(items) != 1 { - t.Fatalf("[旧库] 按操作人查队列应得 1 条,err=%v len=%d", err, len(items)) - } - - // 3) 登录态表自动创建 + 单行读写 - if ss, err := st.GetStationSession(); err != nil || ss != nil { - t.Fatalf("[旧库] 新建登录态表应无记录,ss=%+v err=%v", ss, err) - } - if err := st.SaveStationSession("jwt_x", "zhang", "张三", 3, 9999999999, 7); err != nil { - t.Fatalf("[旧库] 登录态写入失败: %v", err) - } - ss, err := st.GetStationSession() - if err != nil || ss == nil || ss.UserID != 7 || ss.Name != "张三" { - t.Fatalf("[旧库] 登录态读写失败: ss=%+v err=%v", ss, err) - } -} diff --git a/bj_power_workstation/internal/svc/service_context.go b/bj_power_workstation/internal/svc/service_context.go index 9917f01..45f9463 100644 --- a/bj_power_workstation/internal/svc/service_context.go +++ b/bj_power_workstation/internal/svc/service_context.go @@ -8,16 +8,14 @@ import ( "bj_power_workstation/internal/mes" "bj_power_workstation/internal/pdfcache" "bj_power_workstation/internal/store" - "bj_power_workstation/internal/syncer" "bj_power_workstation/internal/tightening" ) -// ServiceContext 服务上下文:配置 + 本地存储 + MES 客户端 + 同步器 + PDF 缓存 + 前端静态资源 + 拧紧枪 OP 接入 +// ServiceContext 服务上下文:配置 + 本地存储 + MES 客户端 + PDF 缓存 + 前端静态资源 + 拧紧枪 OP 接入 type ServiceContext struct { Config config.Config Store *store.Store Mes *mes.Client - Syncer *syncer.Syncer PdfCache *pdfcache.Cache WebFS fs.FS // go:embed 的 web/static 子文件系统 Tightening *tightening.Manager diff --git a/bj_power_workstation/internal/syncer/identity_boundary_test.go b/bj_power_workstation/internal/syncer/identity_boundary_test.go deleted file mode 100644 index 71d17c6..0000000 --- a/bj_power_workstation/internal/syncer/identity_boundary_test.go +++ /dev/null @@ -1,264 +0,0 @@ -package syncer_test - -import ( - "context" - "net/http" - "net/http/httptest" - "strconv" - "sync" - "testing" - "time" - - "bj_power_workstation/internal/mes" - "bj_power_workstation/internal/store" - "bj_power_workstation/internal/syncer" -) - -// 边界场景运行期验证(2026-10-06 简化模型): -// 操作工手动点发送 → 用当前登录这人的身份 → 发不出去就是发不出去(留在本地 SQLite)。 -// 数据按 operator_id 隔离:仅当前登录人自己的未同步数据会被发送; -// 其他人的数据不被代发、不对他人可见;同一人重新登录后可继续发送。 - -// captureServer 假 MES:记录每个请求的 Authorization 头,返回业务成功。 -type captureServer struct { - mu sync.Mutex - auth []string - ts *httptest.Server -} - -func newCaptureServer() *captureServer { - c := &captureServer{} - c.ts = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - c.mu.Lock() - c.auth = append(c.auth, r.Header.Get("Authorization")) - c.mu.Unlock() - w.WriteHeader(200) - _, _ = w.Write([]byte(`{"code":0,"message":"成功","data":null}`)) - })) - return c -} - -func (c *captureServer) count() int { - c.mu.Lock() - defer c.mu.Unlock() - return len(c.auth) -} - -func (c *captureServer) lastAuth() string { - c.mu.Lock() - defer c.mu.Unlock() - if len(c.auth) == 0 { - return "" - } - return c.auth[len(c.auth)-1] -} - -// newTestEnv 开临时 SQLite + 假 MES + syncer。 -func newTestEnv(t *testing.T) (*store.Store, *mes.Client, *syncer.Syncer, *captureServer) { - t.Helper() - st, err := store.Open(t.TempDir() + "/ws.db") - if err != nil { - t.Fatal(err) - } - t.Cleanup(func() { _ = st.Close() }) - cap := newCaptureServer() - t.Cleanup(cap.ts.Close) - mc := mes.New(cap.ts.URL, "tok") - return st, mc, syncer.New(st, mc), cap -} - -// 场景1(按操作人隔离 · 不代发):张三录入离线数据后离线,李四登录—— -// 李四的会话绝不能把张三的数据发出去(RunOnce=0、MES 未收到任何请求、数据保留在本地); -// 张三重新登录后,自己的数据以张三当前有效 JWT 成功发出。 -func TestScenario1_OperatorIsolation(t *testing.T) { - st, mc, sy, cap := newTestEnv(t) - ctx := context.Background() - - // 张三登录(工位3,用户ID7)+ 离线录入 2 条 - if err := st.SaveStationSession("jwt_zhang", "zhang", "张三", 3, time.Now().Add(time.Hour).Unix(), 7); err != nil { - t.Fatal(err) - } - mc.SetStationToken("jwt_zhang") - for i := 0; i < 2; i++ { - if err := st.InsertQueueItem("process_done", `{"sn":"SN-1-`+itoa(i)+`","operator":"张三"}`, 7, "张三"); err != nil { - t.Fatal(err) - } - } - - // 李四登录(MES 网络恢复):张三的数据不被李四的会话代发 - if err := st.SaveStationSession("jwt_li", "li", "李四", 3, time.Now().Add(time.Hour).Unix(), 9); err != nil { - t.Fatal(err) - } - mc.SetStationToken("jwt_li") - if n := sy.RunOnce(ctx); n != 0 { - t.Fatalf("[场景1] 李四不应发送张三的数据,实际成功 %d 条", n) - } - if got := cap.count(); got != 0 { - t.Errorf("[场景1] 李四会话不应向 MES 发出任何报工,实际发出 %d 次", got) - } - if n, _ := st.PendingQueueCount(); n != 2 { - t.Errorf("[场景1] 张三的 2 条应原样保留,实际剩余 %d", n) - } - - // 张三重新登录:仅看到/发送自己的失败数据 - if err := st.SaveStationSession("jwt_zhang2", "zhang", "张三", 3, time.Now().Add(time.Hour).Unix(), 7); err != nil { - t.Fatal(err) - } - mc.SetStationToken("jwt_zhang2") - if n := sy.RunOnce(ctx); n != 2 { - t.Fatalf("[场景1] 张三重登后应成功发送 2 条,实际 %d", n) - } - if got := cap.lastAuth(); got != "Bearer jwt_zhang2" { - t.Errorf("[场景1] 应以张三当前有效 JWT 发出,实际 %q", got) - } - if n, _ := st.PendingQueueCount(); n != 0 { - t.Errorf("[场景1] 发送后队列应清空,实际剩余 %d", n) - } -} - -// 场景2(登出即暂停):张三登出 → 无登录人,任何数据都不发出(发不出去就是发不出去); -// 重新登录(同一人)后数据还在,继续发送成功。 -func TestScenario2_LogoutPausesSending(t *testing.T) { - st, mc, sy, cap := newTestEnv(t) - ctx := context.Background() - - // 张三登录 + 离线录入 - if err := st.SaveStationSession("jwt_zhang", "zhang", "张三", 3, time.Now().Add(time.Hour).Unix(), 7); err != nil { - t.Fatal(err) - } - mc.SetStationToken("jwt_zhang") - if err := st.InsertQueueItem("temp_store", `{"sn":"SN-2","operator":"张三"}`, 7, "张三"); err != nil { - t.Fatal(err) - } - - // 张三登出(镜像 logoutHandler:清 session + 清当前 Bearer) - if err := st.ClearStationSession(); err != nil { - t.Fatal(err) - } - mc.SetStationToken("") - if ss, err := st.GetStationSession(); err != nil || ss != nil { - t.Fatalf("[场景2] 登出后登录态应清空,实际 ss=%+v err=%v", ss, err) - } - // 登出期间:不发送,数据留在本地 - if n := sy.RunOnce(ctx); n != 0 { - t.Fatalf("[场景2] 登出后不应发送,实际成功 %d 条", n) - } - if got := cap.count(); got != 0 { - t.Errorf("[场景2] 登出后不应向 MES 发出请求,实际 %d 次", got) - } - if n, _ := st.PendingQueueCount(); n != 1 { - t.Errorf("[场景2] 数据应保留 1 条,实际 %d", n) - } - - // 张三重新登录:数据还在,继续发送 - if err := st.SaveStationSession("jwt_zhang2", "zhang", "张三", 3, time.Now().Add(time.Hour).Unix(), 7); err != nil { - t.Fatal(err) - } - mc.SetStationToken("jwt_zhang2") - if n := sy.RunOnce(ctx); n != 1 { - t.Fatalf("[场景2] 重登后应成功发送 1 条,实际 %d", n) - } - if got := cap.lastAuth(); got != "Bearer jwt_zhang2" { - t.Errorf("[场景2] 应以张三当前有效 JWT 发出,实际 %q", got) - } -} - -// 场景3(换人直接切换 · 各发各的):张三登录录入后未登出,李四直接登录覆盖单行登录态—— -// 李四会话只发李四自己的新数据;张三的旧数据保留,等张三本人再登录才发。 -func TestScenario3_DirectUserSwitch(t *testing.T) { - st, mc, sy, cap := newTestEnv(t) - ctx := context.Background() - - // 张三登录 + 录入 1 条(MES 不可达时的离线存量) - if err := st.SaveStationSession("jwt_zhang", "zhang", "张三", 3, time.Now().Add(time.Hour).Unix(), 7); err != nil { - t.Fatal(err) - } - mc.SetStationToken("jwt_zhang") - if err := st.InsertQueueItem("process_done", `{"sn":"SN-3","operator":"张三"}`, 7, "张三"); err != nil { - t.Fatal(err) - } - - // 李四直接登录(不登出):单行登录态被覆盖 - if err := st.SaveStationSession("jwt_li", "li", "李四", 3, time.Now().Add(time.Hour).Unix(), 9); err != nil { - t.Fatal(err) - } - mc.SetStationToken("jwt_li") - // 李四也录入 1 条 - if err := st.InsertQueueItem("process_done", `{"sn":"SN-3L","operator":"李四"}`, 9, "李四"); err != nil { - t.Fatal(err) - } - - // 一轮同步:只发李四的 1 条,张三的 1 条保留 - if n := sy.RunOnce(ctx); n != 1 { - t.Fatalf("[场景3] 李四会话应只发送自己的 1 条,实际 %d", n) - } - if got := cap.lastAuth(); got != "Bearer jwt_li" { - t.Errorf("[场景3] 应以李四当前 JWT 发出,实际 %q", got) - } - items, err := st.PendingQueueItems(10) - if err != nil || len(items) != 1 { - t.Fatalf("[场景3] 应剩 1 条(张三的),err=%v len=%d", err, len(items)) - } - if items[0].OperatorID != 7 || items[0].OperatorName != "张三" { - t.Errorf("[场景3] 剩余应为张三的数据:%+v", items[0]) - } - - // 张三再登录:发自己的那条 - if err := st.SaveStationSession("jwt_zhang2", "zhang", "张三", 3, time.Now().Add(time.Hour).Unix(), 7); err != nil { - t.Fatal(err) - } - mc.SetStationToken("jwt_zhang2") - if n := sy.RunOnce(ctx); n != 1 { - t.Fatalf("[场景3] 张三重登后应发送自己的 1 条,实际 %d", n) - } -} - -// 场景4(拧紧结果同样按操作人隔离):张三的拧紧结果不被李四会话发送, -// 张三重登后以当前 JWT 发出。 -func TestScenario4_TorqueOperatorIsolation(t *testing.T) { - st, mc, sy, cap := newTestEnv(t) - ctx := context.Background() - - // 张三登录 + 录入拧紧结果(离线存量,operator_id=7) - if err := st.SaveStationSession("jwt_zhang", "zhang", "张三", 3, time.Now().Add(time.Hour).Unix(), 7); err != nil { - t.Fatal(err) - } - mc.SetStationToken("jwt_zhang") - if _, err := st.InsertTorqueResult(store.TorqueResult{ - WorkOrderNo: "WO-1", Sn: "SN-4", DockCode: "DOCK01", ScrewNo: "S1", - Torque: 10, Angle: 90, Result: "OK", Operator: "张三", OperatorID: 7, - }); err != nil { - t.Fatal(err) - } - - // 李四登录:不代发 - if err := st.SaveStationSession("jwt_li", "li", "李四", 3, time.Now().Add(time.Hour).Unix(), 9); err != nil { - t.Fatal(err) - } - mc.SetStationToken("jwt_li") - if n := sy.RunOnce(ctx); n != 0 { - t.Fatalf("[场景4] 李四不应发送张三的拧紧结果,实际 %d", n) - } - if n, _ := st.PendingTorqueCount(); n != 1 { - t.Errorf("[场景4] 拧紧结果应保留 1 条,实际 %d", n) - } - - // 张三重登:发送 - if err := st.SaveStationSession("jwt_zhang2", "zhang", "张三", 3, time.Now().Add(time.Hour).Unix(), 7); err != nil { - t.Fatal(err) - } - mc.SetStationToken("jwt_zhang2") - if n := sy.RunOnce(ctx); n != 1 { - t.Fatalf("[场景4] 张三重登后应发送 1 条拧紧结果,实际 %d", n) - } - if got := cap.lastAuth(); got != "Bearer jwt_zhang2" { - t.Errorf("[场景4] 应以张三当前有效 JWT 发出,实际 %q", got) - } - if n, _ := st.PendingTorqueCount(); n != 0 { - t.Errorf("[场景4] 发送后应无待同步拧紧结果,实际 %d", n) - } -} - -func itoa(i int) string { - return strconv.Itoa(i) -} diff --git a/bj_power_workstation/internal/syncer/syncer.go b/bj_power_workstation/internal/syncer/syncer.go deleted file mode 100644 index 90cd4ac..0000000 --- a/bj_power_workstation/internal/syncer/syncer.go +++ /dev/null @@ -1,265 +0,0 @@ -package syncer - -import ( - "context" - "encoding/json" - "errors" - "strings" - "time" - - "bj_power_workstation/internal/mes" - "bj_power_workstation/internal/store" - - "github.com/zeromicro/go-zero/core/logx" -) - -const ( - reportBatchLimit = 200 // 单轮最多处理条数 - defaultInterval = 15 * time.Second - - // maxQueueRetry / maxTorqueRetry 重试上报上限:超过该次数不再累加 retry_count、不再刷错误日志, - // 但仍在每轮继续尝试发送(失败数据留本地等待人工/网络恢复处理,不丢弃、不删除)。 - maxQueueRetry = 10 - maxTorqueRetry = 10 - - // defaultBacklogWarnThreshold 待上报积压告警默认阈值(建议1:可由 config.Backlog.WarnThreshold 覆盖)。 - defaultBacklogWarnThreshold = 50 - - // localRetentionSec 本地数据保留时长(30 天):超过该时长的离线数据由后台定时清理。 - localRetentionSec = 30 * 24 * 3600 -) - -// Syncer 后台同步器:每 15 秒把「当前登录人」未同步的 report_queue 与 torque_results 上报 MES。 -// 设计原则(2026-10-06 简化):操作工手动点发送 → 用当前登录这人的身份 → 发不出去就是发不出去 -// (报错、留在本地 SQLite 等人处理),绝不由系统自动决定「等下次有人登录自动补传」。 -// 数据按 operator_id 隔离:仅当前登录人自己的未同步数据会被发送;其他人录入的数据静默保留, -// 不被别人代发,也不对别人可见;同一人重登后可继续发送 / 仅展示失败。 -type Syncer struct { - st *store.Store - mes *mes.Client - interval time.Duration - - // backlogWarnThreshold 待上报积压告警阈值(建议1):队列+拧紧未同步合计超过该值打 WARN; - // 可由 SetBacklogThreshold 从配置注入,<=0 回退默认 50。 - backlogWarnThreshold int -} - -// SetBacklogThreshold 从配置注入积压告警阈值(建议1);n<=0 不改(保留默认 50)。 -func (s *Syncer) SetBacklogThreshold(n int) { - if n > 0 { - s.backlogWarnThreshold = n - } -} - -func New(st *store.Store, mc *mes.Client) *Syncer { - return &Syncer{st: st, mes: mc, interval: defaultInterval, backlogWarnThreshold: defaultBacklogWarnThreshold} -} - -// Run 周期冲刷循环,随 ctx 取消退出。 -func (s *Syncer) Run(ctx context.Context) { - logx.Infof("后台同步协程已启动:每 %s 冲刷一次未上报数据", s.interval) - ticker := time.NewTicker(s.interval) - defer ticker.Stop() - cleanTicker := time.NewTicker(time.Hour) - defer cleanTicker.Stop() - for { - select { - case <-ctx.Done(): - logx.Info("后台同步协程已停止") - return - case <-ticker.C: - if n := s.RunOnce(ctx); n > 0 { - logx.Infof("本轮同步成功 %d 条", n) - } - case <-cleanTicker.C: - if deleted, err := s.st.CleanupOld(localRetentionSec); err != nil { - logx.Errorf("清理本地过期数据失败: %v", err) - } else if deleted > 0 { - logx.Infof("已清理本地 %d 条超过 30 天的离线数据", deleted) - } - } - } -} - -// RunOnce 立即执行一轮同步(先队列后拧紧结果),返回本次成功条数。 -func (s *Syncer) RunOnce(ctx context.Context) int { - n := s.flushQueue(ctx) - n += s.flushTorque(ctx) - // 积压监控(建议1):待上报总量超阈值打 WARN,供日志采集/告警。 - // 区分两类积压,输出固定可匹配的日志标记(BACKLOG_ALERT_IDENTITY / BACKLOG_ALERT_NETWORK): - // - IDENTITY:当前未登录 → 数据等待当前操作人登录后继续发送(可恢复,不阻断产线); - // - NETWORK:已登录仍堆积 → 疑似 MES 网络/业务拒绝,需排查 MES 连通性与返回。 - if qc, err := s.st.PendingQueueCount(); err == nil { - if tc, err2 := s.st.PendingTorqueCount(); err2 == nil { - if total := qc + tc; total > int64(s.backlogWarnThreshold) { - hasSession := false - if ss, e := s.st.GetStationSession(); e == nil && ss != nil && ss.Token != "" { - if ss.ExpireAt <= 0 || time.Now().Unix() < ss.ExpireAt { - hasSession = true - } - } - if hasSession { - logx.Errorf("BACKLOG_ALERT_NETWORK 离线队列积压 %d 条(队列 %d / 拧紧 %d):存在有效登录态仍堆积,疑似 MES 网络或业务拒绝,请检查 MES 连通性与业务返回", total, qc, tc) - } else { - logx.Errorf("BACKLOG_ALERT_IDENTITY 离线队列积压 %d 条(队列 %d / 拧紧 %d):当前未登录,等待当前操作人登录后继续发送", total, qc, tc) - } - } - } - } - return n -} - -// currentSession 取当前有效的在岗登录态;无登录态或凭证已过期返回 nil。 -func (s *Syncer) currentSession() *store.StationSession { - ss, err := s.st.GetStationSession() - if err != nil || ss == nil || ss.Token == "" { - return nil - } - if ss.ExpireAt > 0 && time.Now().Unix() >= ss.ExpireAt { - return nil - } - return ss -} - -// flushTorque 上报「当前登录人」未同步拧紧结果:POST /api/internal/torque/report; -// 成功标记 synced=1,失败保持 0 等待下轮重试(同一登录人重登后续发)。 -func (s *Syncer) flushTorque(ctx context.Context) int { - ss := s.currentSession() - if ss == nil { - return 0 - } - rows, err := s.st.PendingTorqueResultsForOperator(ss.UserID, reportBatchLimit) - if err != nil { - logx.Errorf("查询未同步拧紧结果失败: %v", err) - return 0 - } - - var done []int64 - count := 0 - for _, t := range rows { - select { - case <-ctx.Done(): - return count - default: - } - - // MES 内部接口以 stationNo(数字工位号)落库,并据此做应拧/实拧分组统计; - // 本地存的是 DOCK 编码(DOCK01 ↔ 工位1),上报前换算为工位号。 - stationNo := strings.TrimLeft(strings.TrimPrefix(t.DockCode, "DOCK"), "0") - if stationNo == "" { - stationNo = "0" - } - body := map[string]any{ - "workOrderNo": t.WorkOrderNo, - "sn": t.Sn, - "dockCode": t.DockCode, - "stationNo": stationNo, - "screwNo": t.ScrewNo, - "torque": t.Torque, - "angle": t.Angle, - "result": t.Result, - "operator": t.Operator, - } - // 用当前登录态(即当前在岗操作人)的身份发送,失败即留本地。 - if _, _, err := s.mes.Post("/api/internal/torque/report", body); err != nil { - if errors.Is(err, mes.ErrAuth) { - // 当前登录态失效(理论上 currentSession 已拦截):跳过,等待重新登录后续传。 - continue - } - var bizErr *mes.BizError - if errors.As(err, &bizErr) { - // MES 业务拒绝:数据本身不合法,重传不可能成功 → 标记死信(synced=2)停止重传 - logx.Errorf("拧紧结果被 MES 拒绝已死信(id=%d sn=%s): %v", t.ID, t.Sn, err) - _ = s.st.MarkTorqueDead(t.ID) - continue - } - logx.Errorf("上报拧紧结果失败(id=%d sn=%s 第 %d 次): %v", t.ID, t.Sn, t.RetryCount+1, err) - if t.RetryCount+1 < maxTorqueRetry { - _ = s.st.BumpTorqueRetry(t.ID) - } - continue - } - done = append(done, t.ID) - count++ - } - if len(done) > 0 { - if err := s.st.MarkTorqueSynced(done); err != nil { - logx.Errorf("标记拧紧结果已同步失败: %v", err) - } - } - return count -} - -// flushQueue 上报「当前登录人」未同步的离线缓存队列,payload 原样透传: -// - kind=process_done → POST /api/internal/station/report -// - kind=temp_store → POST /api/internal/station/checkin -// - kind=online_register → POST /api/internal/workpiece/online(上线建档) -// - kind=offline_finish → POST /api/internal/workpiece/done(下线完工入库) -// -// 每条使用当前在岗登录态 JWT 发送;成功标记 synced=1;失败 synced 保持 0 并累计 retry_count, -// 留本地等待同一操作人重新登录后续传或人工排查。仅发送「当前登录人自己」的数据,他人数据不被代发。 -func (s *Syncer) flushQueue(ctx context.Context) int { - ss := s.currentSession() - if ss == nil { - return 0 - } - items, err := s.st.PendingQueueItemsForOperator(ss.UserID, reportBatchLimit) - if err != nil { - logx.Errorf("查询待上报队列失败: %v", err) - return 0 - } - - count := 0 - for _, it := range items { - select { - case <-ctx.Done(): - return count - default: - } - - var path string - switch it.Kind { - case "process_done": - path = "/api/internal/station/report" - case "temp_store": - path = "/api/internal/station/checkin" - case "online_register": - path = "/api/internal/workpiece/online" - case "offline_finish": - path = "/api/internal/workpiece/done" - default: - logx.Errorf("未知队列类型(kind=%s id=%d),跳过", it.Kind, it.ID) - _ = s.st.BumpQueueRetry(it.ID) - continue - } - - if _, _, err := s.mes.Post(path, json.RawMessage(it.Payload)); err != nil { - if errors.Is(err, mes.ErrAuth) { - continue - } - var bizErr *mes.BizError - if errors.As(err, &bizErr) { - // MES 业务拒绝:数据本身不合法,重传不可能成功 → 标记死信(synced=2)停止自动重传, - // 失败原因落 last_error 供「重传处理」查看(如「工件位置 END-U 已被工件 xxx 占用」)。 - reason := strings.TrimSpace(bizErr.Message) - if reason == "" { - reason = err.Error() - } - logx.Errorf("队列条目被 MES 拒绝已死信(kind=%s id=%d): %v", it.Kind, it.ID, err) - _ = s.st.MarkQueueDead(it.ID, reason) - continue - } - logx.Errorf("上报队列失败(kind=%s id=%d 第 %d 次): %v", it.Kind, it.ID, it.RetryCount+1, err) - if it.RetryCount+1 < maxQueueRetry { - _ = s.st.BumpQueueRetry(it.ID) - } - continue - } - if err := s.st.MarkQueueSynced(it.ID); err != nil { - logx.Errorf("标记队列已同步失败(id=%d): %v", it.ID, err) - continue - } - count++ - } - return count -} diff --git a/bj_power_workstation/internal/syncer/syncer_verify_test.go b/bj_power_workstation/internal/syncer/syncer_verify_test.go deleted file mode 100644 index d0d89e2..0000000 --- a/bj_power_workstation/internal/syncer/syncer_verify_test.go +++ /dev/null @@ -1,83 +0,0 @@ -package syncer_test - -import ( - "context" - "net/http" - "net/http/httptest" - "testing" - "time" - - "bj_power_workstation/internal/mes" - "bj_power_workstation/internal/store" - "bj_power_workstation/internal/syncer" -) - -// TestStationAuthStaleNoDataLoss 运行期验证核实3:工位登录态过期(JWT 401)时, -// 离线 syncer 暂停发送、数据保留在本地 SQLite;同一操作人重新登录(有效凭证)后继续发送,数据不丢。 -func TestStationAuthStaleNoDataLoss(t *testing.T) { - // 假 MES:Bearer=valid 返回 200,其余返回 401 - ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - if r.Header.Get("Authorization") == "Bearer valid" { - w.WriteHeader(200) - _, _ = w.Write([]byte(`{"code":0}`)) - return - } - w.WriteHeader(401) - _, _ = w.Write([]byte(`{"code":401,"message":"unauthorized"}`)) - })) - defer ts.Close() - - dbPath := t.TempDir() + "/ws.db" - st, err := store.Open(dbPath) - if err != nil { - t.Fatal(err) - } - defer st.Close() - - // 注入一条未同步拧紧结果(模拟离线缓存) - if _, err := st.InsertTorqueResult(store.TorqueResult{ - WorkOrderNo: "WO-1", Sn: "SN-1", DockCode: "DOCK01", ScrewNo: "S1", - Torque: 10, Angle: 90, Result: "OK", Operator: "张三", - }); err != nil { - t.Fatal(err) - } - - mc := mes.New(ts.URL, "tok") - mc.SetStationToken("expired") // 当前 client token(镜像真实登录) - _ = st.SaveStationSession("expired", "u", "U", 1, time.Now().Add(-time.Hour).Unix(), 0) // 登录态已过期 - - sy := syncer.New(st, mc) - ctx := context.Background() - - // 阶段A:过期凭证 → 401,syncer 整轮暂停,数据保留在本地 - n := sy.RunOnce(ctx) - if n != 0 { - t.Errorf("[核实3] 过期凭证下应暂停发送返回 0,实际 %d", n) - } - pending, _ := st.PendingTorqueCount() - if pending != 1 { - t.Errorf("[核实3] 数据应保留 1 条,实际 %d", pending) - } - list, _ := st.ListTorqueResults("", true, 10) - if len(list) == 1 && list[0].RetryCount != 0 { - t.Errorf("[核实3] 过期凭证不应 bump 重试次数,实际 %d", list[0].RetryCount) - } - if len(list) == 1 && list[0].Synced { - t.Errorf("[核实3] 过期凭证不应标记已同步") - } - t.Logf("[核实3 过期凭证] RunOnce=%d pending=%d retry=%d(数据保留在本地)", n, pending, list[0].RetryCount) - - // 阶段B:重新登录(有效凭证)→ syncer 恢复,数据成功上报 - mc.SetStationToken("valid") // 当前 client token - _ = st.SaveStationSession("valid", "u", "U", 1, time.Now().Add(time.Hour).Unix(), 0) // 登录态恢复有效 - - n = sy.RunOnce(ctx) - if n != 1 { - t.Errorf("[核实3] 重新登录后应成功发送 1 条,实际 %d", n) - } - pending, _ = st.PendingTorqueCount() - if pending != 0 { - t.Errorf("[核实3] 上报后应无待同步数据,实际 %d", pending) - } - t.Logf("[核实3 重新登录] RunOnce=%d pending=%d(发送成功,数据不丢)", n, pending) -} diff --git a/bj_power_workstation/main.go b/bj_power_workstation/main.go index b42e7c8..ba079f7 100644 --- a/bj_power_workstation/main.go +++ b/bj_power_workstation/main.go @@ -22,7 +22,6 @@ import ( "bj_power_workstation/internal/pdfcache" "bj_power_workstation/internal/store" "bj_power_workstation/internal/svc" - "bj_power_workstation/internal/syncer" "bj_power_workstation/internal/tightening" "bj_power_workstation/internal/scanbridge" @@ -109,7 +108,7 @@ func main() { panic(fmt.Sprintf("加载内嵌前端资源失败: %v", err)) } - // 本地 SQLite:拧紧数据缓存 + 离线上报队列 + 操作日志 + 内置账号 + // 本地 SQLite:操作日志 + 内置账号 + 登录态(2026-11-05 拍板:断网即失败,无离线队列/重试缓存) st, err := store.Open(c.Sqlite.Path) if err != nil { panic(fmt.Sprintf("打开本地 SQLite(%s) 失败: %v", c.Sqlite.Path, err)) @@ -128,11 +127,6 @@ func main() { // 证明当前操作人仍活跃在岗,后台 sweeper 据此判断是否超时自动登出。 mc.Touch = func() { _ = st.TouchStationSession() } - // 后台同步协程:联网时向 MES 补报未同步数据 - sy := syncer.New(st, mc) - sy.SetBacklogThreshold(c.Backlog.WarnThreshold) // 建议1:积压告警阈值可配置(yaml backlog.warnThreshold) - go sy.Run(rootCtx) - // 核实4:空闲自动登出 sweeper——周期性检查登录态空闲时长,超过 IdleLogoutSeconds 则清除 // 本地登录态并失效 Bearer 凭证,强制换班/下一班操作工重新登录,杜绝共享终端身份错位。 go func() { @@ -157,7 +151,7 @@ func main() { }() // 拧紧枪 OP 接入(阿特拉斯 Open Protocol):Enable=true 时后台长连接控制器,接收拧紧结果暂存, - // 操作工在界面点「完成」才经 POST /api/tightening/record 落本地库并上报 MES;Enable=false 时仍走人工录入。 + // 操作工在界面点「完成」才经 POST /api/tightening/record 实时直连上报 MES(断网即失败报错);Enable=false 时仍走人工录入。 tm := tightening.NewManager(c.Tightening) go tm.Run(rootCtx) @@ -183,7 +177,6 @@ func main() { Config: c, Store: st, Mes: mc, - Syncer: sy, PdfCache: pdc, WebFS: staticFS, Tightening: tm, diff --git a/bj_power_workstation/migrations/20261105_drop_offline_queue.sql b/bj_power_workstation/migrations/20261105_drop_offline_queue.sql new file mode 100644 index 0000000..ed87b7a --- /dev/null +++ b/bj_power_workstation/migrations/20261105_drop_offline_queue.sql @@ -0,0 +1,25 @@ +-- ===================================================================== +-- 2026-11-05 工位终端离线队列/重试机制下线,清理废弃本地表 +-- 依据:用户拍板(2026-11-05)——工位终端断网时操作直接失败、明确提示, +-- 不做离线队列、不做自动重试/联网补传;本地 SQLite 只保留 +-- 纯本地数据(users / event_log / station_session)。 +-- 执行方式:部署时手工执行(禁止服务启动时更新数据库)。 +-- 幂等:可重复执行。 +-- 影响表:report_queue(离线上报队列,含待重传/死信记录)、 +-- torque_results(本地拧紧结果缓存,扭矩已改为实时直连 MES 上报)。 +-- ⚠ 数据丢失提示: +-- ① report_queue 内未同步成功的记录删除后不可恢复(MES 侧无副本)。 +-- ② torque_results 本地历史扭矩数据随表删除;已成功上报的记录以 MES 侧为准 +-- (扭矩现走实时直连 MES /api/internal/torque/report)。 +-- 执行前如需留档,请先备份 db 文件或导出两表内容。 +-- ===================================================================== + +-- 【第 1 步:删前行数留档】执行 DROP 前先跑下面两条查询,把结果记入部署记录: +-- SELECT COUNT(*) FROM report_queue; +-- SELECT COUNT(*) FROM torque_results; + +DROP TABLE IF EXISTS report_queue; +DROP TABLE IF EXISTS torque_results; + +-- 执行后核对(应均返回 0 行): +-- SELECT name FROM sqlite_master WHERE type='table' AND name IN ('report_queue','torque_results'); diff --git a/bj_power_workstation/web/static/index.html b/bj_power_workstation/web/static/index.html index baf50cc..be87e06 100644 --- a/bj_power_workstation/web/static/index.html +++ b/bj_power_workstation/web/static/index.html @@ -6,7 +6,7 @@ 工位终端 - + diff --git a/案例.md b/案例.md index 41d8c36..54ca546 100644 --- a/案例.md +++ b/案例.md @@ -66,14 +66,14 @@ - 「仓储作业 → 来料检验」:待检清单逐张「整单送检」,批次类逐条判「合格」,20 颗断路器逐颗判合格,记录人填本人姓名,提交 →「检验已记录:共 52 条」。检验合格后「库存查询 → 库位明细」质量状态变「合格」。(截图占位:来料检验) **3. 计划员(MES)建工单与排产** -- 「生产管理 → 工单管理」点「新建工单」:产品型号选 DX-100,数量 6,完成日期必选,产品工艺选「ChengPin001」带出 3 道工序,每道工序从下拉**选真实工位**(工序1 选工位3、工序2 选工位6、工序3 选工位12)。候选只列绑定该工序的启用工位;系统不出现也不接受工位 0 之类的虚拟落点——工件上线建档同样必须落在真实首道工序工位(见第 5 步)。保存校验:某道工序未选提示「第 N 道工序「××」未选择工位」;工位号不递增提示不大于上一道工序工位;工位未绑定该工序提示「工位 N 当前未绑定工序「××」」。 +- 「生产管理 → 工单管理」点「新建工单」:产品型号选 DX-100,数量 6,完成日期必选,产品工艺选「ChengPin001」带出 3 道工序,每道工序从下拉**选工位**(工序1 选工位3、工序2 选工位6、工序3 选工位12)。**工位编号为正整数或负整数(负数=产线前段虚拟工位),0 表示未指定、不可作为落点;主线停靠位/缓存位编号为 C1~C15**;候选只列绑定该工序的启用工位——工件上线建档同样必须落在首道工序候选工位(见第 5 步)。保存校验:某道工序未选提示「第 N 道工序「××」未选择工位」;组合中出现工位 0 提示「工位号不能为 0(0 表示未指定)」;工位号不递增提示不大于上一道工序工位;工位未绑定该工序提示「工位 N 当前未绑定工序「××」」。 - 行操作点「自动排产」→ 选日期范围 2026-11-05、模式「平均分摊」→「自动排产已生成(待下发并开工自动启用)」;回工单列表点「下发并开工」(状态 已创建 → 执行中),排产自动启用。 **4. 库管员(WMS)看备料清单** 进入「仓储作业 → 备料清单」(只读页):按「日期 × 工单 × 产品 × 工位 × 物料 × 数量」展示今天及以后的备料需求——工位3 箱体 6、面板 6;工位6 断路器 12 颗(6 台 × 单台 2 颗);工位12 铭牌 6。需求为**实时计算**(工艺物料清单改动即联动),页面不管库存是否够、也没有任何"备料完成"类按钮;另有「按物料汇总」页签与 CSV 导出。(截图占位:备料清单) **5. 操作工(工位终端)上线建档与叫料** -- 「上线建档」页签:选工单 WO-20261105-001,落点工位选**工位 3**(本工单首道工序的真实工位),工件号点「自动生成」(如 DX100-SN-0001)→「确认建档上线」。 +- 「上线建档」页签:选工单 WO-20261105-001,落点工位选**工位 3**(本工单首道工序候选工位),工件号点「自动生成」(如 DX100-SN-0001)→「确认建档上线」。 - 「物料 / 叫料」页签上方为**工位物料明细卡**:按工艺物料清单全集逐行展示本工位的需求数、可用数、已发数、已耗数(数量为 0 的物料也显示,不区分左右托盘);底层叫料池仍按**工位 × 物料**合并记账,两层并存、互不替代。 - 叫料以**叫料包**为单元:一次提交=一个包(系统自动生成包号)。物料勾选默认全选、叫料量预填本工位可用量可改,可叫部分料、可分次补叫——工位3 先叫箱体 4、面板 6,后再补叫箱体 4;工位6 叫断路器 12。叫料日默认当天,**可选其他有排产的日期**(含明日等)——选非当日时按跨日量在提示横幅中列明细,不拦提交;**期望接驳台整包只选一次、非必填**(可留空,配送时由库房确定实际接驳台,界面只显示中文左/右)。每次点「提交叫料」→「叫料已提交:N 项」。 - 提交前实时显示两条**提示横幅**(实时计算、不落库、不拦截提交):① 当日剩余未叫清单——本工位当日排产需求还有哪些物料没叫;② 跨日量明细——排产跨多天时各天的量如何分布。 @@ -150,7 +150,7 @@ **流水1-3 建工单、排产、下发开工** - ①前置条件:物料/工艺/工位绑定就绪;合格在库充足。 -- ②角色/菜单/动作:计划员 → MES「生产管理 → 工单管理 → 新建工单」:产品 DX-100 ×6、完成日期必选、工艺 ChengPin001 带出 3 道工序,逐道选真实工位(3→6→12)→ 保存;行操作「自动排产」选 2026-11-05、模式「平均分摊」→ 回列表点「下发并开工」。 +- ②角色/菜单/动作:计划员 → MES「生产管理 → 工单管理 → 新建工单」:产品 DX-100 ×6、完成日期必选、工艺 ChengPin001 带出 3 道工序,逐道选工位(3→6→12,工位号为正整数或负整数、0 不可选)→ 保存;行操作「自动排产」选 2026-11-05、模式「平均分摊」→ 回列表点「下发并开工」。 - ③系统内部:保存校验(未选工位提示「第 N 道工序「××」未选择工位」;工位未绑定该工序提示「工位 N 当前未绑定工序「××」」);排产生成当日计划并在下发开工时自动启用;工单状态 已创建 → 执行中。 - ④结果影响(含菜单变化):工单列表出现执行中工单;「日排产」出现当日计划;看板「当前工单」出现 WO-20261105-001;WMS「备料清单」随即出现本工单需求行(见流水1-4)。 - ⑤异常分支:漏选/绑错工位按提示拦截不落库;不下发开工则工单停在「已创建」,现场上线建档无从选起。 @@ -166,10 +166,10 @@ **流水1-5 上线建档与叫料(D14、D15、D1)** - ①前置条件:工单执行中;工位3/6 接驳台空闲;合格库存充足。 -- ②角色/菜单/动作:操作工 → 工位终端「上线建档」:选 WO-20261105-001、落点工位 3(本工单首道工序真实工位)、工件号「自动生成」DX100-SN-0001 →「确认建档上线」;→「物料 / 叫料」页签:上方工位物料明细卡按工艺物料全集展示四数(量为 0 也显示);叫料按**叫料包**提交(勾选默认全选、叫料量预填可用量可改、叫料日默认当天可改选其他有排产的日期),工位3 先叫箱体 4、面板 6(期望接驳台整包选一次选「工位3左」,**非必填**,界面只显示中文左/右,D14)→「提交叫料」;再补叫箱体 4;工位6 叫断路器 12。每次提交提示「叫料已提交:N 项」;提交前显示当日剩余未叫/跨日量两条提示横幅(实时计算、不落库、不拦截)。 +- ②角色/菜单/动作:操作工 → 工位终端「上线建档」:选 WO-20261105-001、落点工位 3(本工单首道工序候选工位)、工件号「自动生成」DX100-SN-0001 →「确认建档上线」;→「物料 / 叫料」页签:上方工位物料明细卡按工艺物料全集展示四数(量为 0 也显示);叫料按**叫料包**提交(勾选默认全选、叫料量预填可用量可改、叫料日默认当天可改选其他有排产的日期),工位3 先叫箱体 4、面板 6(期望接驳台整包选一次选「工位3左」,**非必填**,界面只显示中文左/右,D14)→「提交叫料」;再补叫箱体 4;工位6 叫断路器 12。每次提交提示「叫料已提交:N 项」;提交前显示当日剩余未叫/跨日量两条提示横幅(实时计算、不落库、不拦截)。 - ③系统内部:建档生成在制工件(上线、落位工位3);叫料按包提交、按工位×物料聚合进池(D15),包内单据「待备料」;池行需求不带折损,本步手选部分量/分次补叫即最终口径(D1);提交前校验左右接驳台均为空(读接驳台托盘位传感器;PLC/传感器离线弹风险提示人工确认后可继续)。 - ④结果影响(含菜单变化):MES「生产管理 → 叫料单」出现池行并随提交累计;WMS「叫料队列」按包出现「待备料」单;「工件追溯」出现 DX100-SN-0001 生命线首节点。 -- ⑤异常分支:本工位可用量 >0 时**不出现**「去借料」入口(借料门只在可用量=0 出现,D12);接驳台有托盘时空台校验提示先清台面(可用「托盘回库」拉回 JBT21,不动物料账与库存);工单未执行/落点非首道工序真实工位被建档校验拦下(不出现也不接受工位 0 之类虚拟落点)。 +- ⑤异常分支:本工位可用量 >0 时**不出现**「去借料」入口(借料门只在可用量=0 出现,D12);接驳台有托盘时空台校验提示先清台面(可用「托盘回库」拉回 JBT21,不动物料账与库存);工单未执行/落点非首道工序候选工位被建档校验拦下(工位 0 表示未指定,不可作为落点)。 - ⑥PLC点位:读左右接驳台托盘位传感器做空台校验(模拟模式跳过该校验);期望接驳台为叫料时的非必填意向,非传感器判定。 **流水1-6 完成备料(D1、D9)** @@ -276,7 +276,7 @@ ### 【操作步骤(按角色/菜单)】 **1. 建双工单、排产、开工** -计划员按上表建两张工单(每道工序选真实工位、逐道校验同场景一),分别「自动排产」→「下发并开工」。 +计划员按上表建两张工单(每道工序选工位、逐道校验同场景一),分别「自动排产」→「下发并开工」。 **2. 叫料池合并展示(关键节点)** 各工位按**叫料包**提交叫料(一次提交=一个包;期望接驳台整包选一次、非必填,本例工位3 选「工位3左」、工位4 选「工位4左」、工位6 选「工位6右」)后,MES「生产管理 → 叫料单」按**工位 × 物料**聚合展示:**工位6 只有一行断路器,需求 = A 单 6 颗(3 台×2)+ B 单 4 颗(2 台×2)= 10 颗**——池子只知道工位与物料,不知道工单;工件流到工位时按**工件所属工单**消耗对应物料,不混账。两单各自工件在工位终端「当前任务」下拉切换,报工互不串单。 @@ -337,7 +337,7 @@ **流水2-1 建双工单、排产、开工** - ①前置条件:场景二独立批次入库合格(箱体 8/面板 8/铭牌 6/断路器 24 颗,Z02);工位 3/4/6/12 启用。 - ②角色/菜单/动作:计划员 → MES 工单管理建 A(WO-20261106-001,3 台,3→6→12)、B(WO-20261106-002,2 台,4→6→12)→ 各自「自动排产」(2026-11-06、平均分摊)→「下发并开工」。 -- ③系统内部:逐道工序选真实工位、校验同场景一;工序2 两单同选工位6——**多工位同工艺=并行候选工位**(工件在任一候选工位报工一次即完成该工序,本例 A/B 各占一个候选)。 +- ③系统内部:逐道工序选工位(工位号为正整数或负整数、0 不可选)、校验同场景一;工序2 两单同选工位6——**多工位同工艺=并行候选工位**(工件在任一候选工位报工一次即完成该工序,本例 A/B 各占一个候选)。 - ④结果影响(含菜单变化):A/B 并行执行中;看板「当前工单」同屏并列两单;备料清单出现两单需求(工位3 箱体3/面板3、工位4 箱体2/面板2、工位6 断路器 3×2+2×2=10、工位12 铭牌 5)。 - ⑤异常分支:漏选工位/绑错工序按提示拦截。 - ⑥PLC点位:本步不读 PLC。 @@ -553,6 +553,7 @@ - **所有跟 AGV 相关的操作——送料、退料、代退料、补料、空托盘回收、有料托盘回收、转产退料拉料——派车由库管在 WMS 手动确认,或传感器检测条件满足(工位接驳台有托盘 且 JBT21 有空位)自动触发;提交单据本身不直接触发 AGV。** JBT21 无空位时不派车、等待。 - 库管手动「派车回收空托盘」同样要求 JBT21 有空位:JBT21 无空位时,点击「派车回收空托盘」弹出提示并拒绝派车。 - AGV 步进放行保留人工确认:每段到位停在「到位待令」→ 人工确认装车/卸货 → 再走下一段。 +- 到位后自动放行的唯一路径:AGV 到位待令且落点为**产线接驳台**时,若刷新/回调时该接驳台 PLC 传感器检测到托盘(货已卸到位),系统自动卸货放行——但**送料(配送单驱动)任务除传感器读到托盘外,还须关联配送单状态为「已送达」,两者都满足才放行;配送单未送达(或 WMS 查询失败)则不自动放行,转人工确认**(落预警留痕)。托盘回收/自由调度无单据联动,仍按传感器判定。人工确认的业务理由:接驳台上的托盘不一定属于本趟任务,可能属于其他工单、其他工位或上一趟遗留,传感器判断不了归属,只能靠库管确认防错取。 - 自由调度只允许单点步进,每次弹窗警告「请确保路径畅通无杂物」。 - 防撞三态:目标接驳台有托盘 → 硬拒;点位/接驳台已停用 → 硬拒;无传感器的纯点位 → 弹二次确认后放行。 - AGV 是搬运工不是仓库:只有把货卸到目标点位才算完成;超时未卸货(时长在 MES 基础设置配置,默认 5 分钟)自动落预警。