Commit Graph

Select branches

Hide Pull Requests

dev

dev-temp-xw-202501031219-44700

dev-temp-xw-202501150000-44852

dev_temp_xw_20250305_45455

dev_temp_xw_202503120000_45631

dev_temp_xw_202503170000_45656

master

test

test-temp-wj-250117-pack

uat

uat-temp-castle-250211-44248

uat-temp-logic-20250313-45610

uat-temp-nht-2502100000-45019

uat-temp-nht-2503040000-seres

uat-temp-nht-2503130000-chengdu-shipping

uat-temp-nht-2503130000-shipping

uat-temp-nht-chengdu-loading

uat-temp-wj-250124-equ-check-step

uat-temp-wj-2502060000-chongqing-step

uat-temp-wj-chongqingdaqu-dev

uat-temp-wj-chongqingdaqu-prod

yfai-mes-ext-v1.0

yfai-mes-ext-v1.1

yfai-mes-ext-v1.2

yfai-mes-ext-v1.3

yfai-mes-ext-v1.4

yfai-mes-ext-v1.5

yfai-mes-ext-v1.6

yfai-mes-ext-v1.7

yfai-mes-ext-v1.8

yfai-mes-ext-v1.9

yfai-mes-ext-v2.0

yfai-mes-ext-v2.1

yfai-mes-ext-v2.2

yfai-mes-ext-v2.3

yfai-mes-ext-v2.4

yfai-mes-ext-v2.5

yfai-mes-ext-v2.7

yfai-mes-ext-v2.8

yfai-mes-ext-v2.9

yfai-mes-ext-v3.0

yfai-mes-ext-v3.1

yfai-mes-ext-v3.11

yfai-mes-ext-v3.2

yfai-mes-ext-v3.3

Mono Color

• 99c87bd8bc Merge remote-tracking branch 'origin/dev' into dev jun 2024-12-03 18:36:41 +0800
• 215b62a601 同步脚本本地备份 jun 2024-12-03 18:34:10 +0800
• c5987d3bd8 武汉cockpit发运防错按照散件方式写入 jun 2024-12-03 18:33:24 +0800
• 603d84d5a6 Merge remote-tracking branch 'origin/dev' into dev xiangwei.zhang 2024-12-02 09:46:23 +0800
• 368b04fe68 BTO看板 xiangwei.zhang 2024-12-02 09:43:23 +0800
• acab8131a0 对账单信息 xiangwei.zhang 2024-12-02 09:40:34 +0800
• 86bf0387a6 WMS发运调用CBR负报工接口逻辑修改 jun 2024-11-28 16:15:59 +0800
• 30e98fb248 工单加工记录报表增加工单标识字段查询条件 jun 2024-11-28 13:40:12 +0800
• a186bb7d63 拉动组明细 接口加查询条件 王杰 2024-11-25 17:49:11 +0800
• da514d59d9 Merge branch 'dev' into dev-wuhan 王杰 2024-11-25 13:50:07 +0800
• 651fb28a10 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 臧学普 2024-11-25 10:33:21 +0800
• d53d41b1a3 线末大屏看板-黄色修改为橙色-43940 臧学普 2024-11-25 10:32:25 +0800
• 94eb8aa5fc 打印 目视单 王杰 2024-11-24 17:37:57 +0800
• 162cee7c19 关闭工单 时 同时关闭JIS SPS QUEUE[创建] 单据 目视单打印队列 王杰 2024-11-24 16:57:25 +0800
• f1a2bc3cd3 Merge remote-tracking branch 'origin/dev' into dev jun 2024-11-24 16:54:33 +0800
• 041e3ab40d 手工查单，工单类型按照选择的类型赋值 jun 2024-11-24 16:53:49 +0800
• 90f4502454 关闭工单 时 同时关闭JIS SPS QUEUE[创建] 单据 王杰 2024-11-24 16:47:00 +0800
• 3f466e59b6 脚本本地备份 jun 2024-11-24 16:11:32 +0800
• a244b350f2 产品加工记录增加工单状态查询 jun 2024-11-24 15:41:08 +0800
• 300d9114cf Merge remote-tracking branch 'origin/dev' into dev jun 2024-11-24 15:40:01 +0800
• e42891c570 手工查单问题修复 jun 2024-11-24 15:38:45 +0800
• 41cd843f32 打印目视单 王杰 2024-11-24 14:31:53 +0800
• 55afdefd2f 排除产品加工规则 生产线 like ； 发运查询 发运单号 like 王杰 2024-11-23 10:05:23 +0800
• 2d98ac7c86 Merge remote-tracking branch 'origin/dev' into dev jun 2024-11-22 20:06:22 +0800
• d2c977b5de 点检功能点优化 jun 2024-11-22 20:04:45 +0800
• 0f8dcbfc75 Merge branch 'dev' into dev-wuhan 王杰 2024-11-22 18:31:29 +0800
• 59502ee279 工单管理排序 王杰 2024-11-22 16:16:01 +0800
• 0250db7d47 零件发运组--客户工厂与信息点联动 臧学普 2024-11-22 15:23:15 +0800
• a57679591f Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 王杰 2024-11-22 09:29:42 +0800
• 046cfd8b52 主数据： PTR零件查询 发运单查询条件 修改 王杰 2024-11-22 09:29:35 +0800
• 762880e567 统一都用生产版本工作中心 xiangwei.zhang 2024-11-22 09:27:54 +0800
• 2854686dde 修改看板逻辑 臧学普 2024-11-22 08:22:47 +0800
• 5432c0400c 如果装配件有展示顺序，在ptr替换是需要替换目视项 臧学普 2024-11-21 17:16:35 +0800
• bcabf20313 如果装配件有展示顺序，在ptr替换是需要替换目视项 臧学普 2024-11-21 17:13:48 +0800
• 6943238b6d Merge remote-tracking branch 'origin/dev' into dev xiangwei.zhang 2024-11-21 16:16:26 +0800
• 41cfa4e252 BTO报工用生产版本工作中心 xiangwei.zhang 2024-11-21 16:15:20 +0800
• 188284ab69 增加http接口 pcn调用 用于将数据自动初始化到工位按钮表 王杰 2024-11-21 16:09:04 +0800
• 5f75e8cfb1 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 臧学普 2024-11-20 23:22:01 +0800
• 694ed06b59 客户零件号需要从零件生产组中获取 臧学普 2024-11-20 23:14:32 +0800
• 0c2edd3b55 工单页面查询报错 jun 2024-11-20 11:34:33 +0800
• 537e117303 自定义脚本同步 jun 2024-11-20 10:46:40 +0800
• 05a1f10218 发运单查询时间条件不生效 jun 2024-11-20 09:33:35 +0800
• 97118b9857 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 臧学普 2024-11-19 09:51:47 +0800
• 9a9799a1c6 看板调整产量计算公式 臧学普 2024-11-19 09:50:02 +0800
• ca3b8b9fe2 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan jun 2024-11-18 22:44:35 +0800
• eac136850f 武汉CBR负报工 jun 2024-11-18 22:43:00 +0800
• 78dfc1657f 目视单PTR转P 臧学普 2024-11-18 20:10:27 +0800
• 91ba35debe BTO工单新增报错 yfai-mes-ext-v2.3 jun 2024-11-18 19:28:13 +0800
• e077cdb0e5 目视单增加车型备注 臧学普 2024-11-18 18:52:14 +0800
• 66db54816c 目视单增加车型备注 臧学普 2024-11-18 18:49:56 +0800
• ab3151da6f 看板调整及目视单打印调整 臧学普 2024-11-18 14:47:31 +0800
• f95006915e 看板调整 臧学普 2024-11-18 10:20:46 +0800
• 1a86c4d7b0 目视单打印 臧学普 2024-11-17 20:03:16 +0800
• e1e8106db7 PTR逻辑修改 臧学普 2024-11-17 19:34:47 +0800
• 66dcc038b2 PTR逻辑修改 臧学普 2024-11-17 15:01:16 +0800
• 901cb3e00c Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 臧学普 2024-11-17 15:00:45 +0800
• 3a2fa64bbd PTR逻辑修改 臧学普 2024-11-17 14:58:55 +0800
• d97e9be49d docker 王杰 2024-11-17 13:44:19 +0800
• 20bd304728 离线装配件表校验 cfgOfflineRao表中是否已经存在了客户零件号，如果存在则跳过 防止多个零件生产组生成相同的数据 臧学普 2024-11-16 17:35:26 +0800
• 8922c24857 离线装配件表校验 cfgOfflineRao表中是否已经存在了客户零件号，如果存在则跳过 防止多个零件生产组生成相同的数据 臧学普 2024-11-16 17:34:05 +0800
• 0e891ccb14 PTR逻辑及F单逻辑修改 臧学普 2024-11-16 17:25:39 +0800
• 5d06663578 SPS单据打印优化，增加每次查询条数 jun 2024-11-16 15:48:24 +0800
• d2cc32a6e7 Merge branch 'dev' into dev-wuhan jun 2024-11-15 17:39:12 +0800
• 9cd5fec986 SPS单据打印车型名称 jun 2024-11-15 16:59:25 +0800
• 92587bd4f5 CBR负报工接口添加日志 jun 2024-11-14 21:24:08 +0800
• 96dec1f462 CBR负报工接口添加日志 jun 2024-11-14 20:53:14 +0800
• 57b20494ea Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan jun 2024-11-14 19:05:19 +0800
• 862da84fd6 43683 发运单明细显示：需要显示物料名称，及正序排序客户排序信息 jun 2024-11-14 19:04:24 +0800
• 35ff11fb98 点检单，删除逻辑修改 xiangwei.zhang 2024-11-14 17:58:28 +0800
• f72dbdeef4 bom不生效时，只生成工单不生产装配件及物料清单 臧学普 2024-11-14 16:05:16 +0800
• ae5acb76b1 bom不生效时，只生成工单不生产装配件及物料清单 臧学普 2024-11-14 15:22:19 +0800
• 68908190ed 生产零件号是用来查找生产版本与bom 存在于零件生产组中 臧学普 2024-11-14 14:01:00 +0800
• d6bddfff1a PC排序汇报问题修复 jun 2024-11-14 11:37:31 +0800
• 3c92dbb3ff 离线打印字段确认 臧学普 2024-11-14 11:32:41 +0800
• 6f975db843 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 臧学普 2024-11-14 11:31:35 +0800
• 487c683569 离线打印字段确认 臧学普 2024-11-14 11:31:07 +0800
• 1e85f2c093 Merge remote-tracking branch 'origin/dev' into dev-wuhan jun 2024-11-14 11:02:31 +0800
• cfb57c094d 工单同步wms功能开发 jun 2024-11-14 11:00:32 +0800
• 079cbf07cb 设备点检导入 xiangwei.zhang 2024-11-13 15:38:16 +0800
• f0c9b5b424 对账单信息 xiangwei.zhang 2024-11-13 15:13:19 +0800
• 81ca92c4e1 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 臧学普 2024-11-13 10:33:01 +0800
• 185780a999 线末大屏颜色问题 臧学普 2024-11-13 10:30:24 +0800
• 7fd55a504f 导入也需要修改同步状态 xiangwei.zhang 2024-11-12 16:30:49 +0800
• 8bb57ecb56 SPS拉动单生成优化 jun 2024-11-12 12:42:56 +0800
• 440753bdd7 发运增加扫描日志信息 jun 2024-11-12 12:33:30 +0800
• 419fc65025 工单号顺序号调整 臧学普 2024-11-11 19:03:16 +0800
• 974ad7bc7f Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 臧学普 2024-11-11 11:43:58 +0800
• f3906aac6b 设备停机记录job修改 xiangwei.zhang 2024-11-11 09:35:54 +0800
• fc9e36abcf 离线job生成装配件及拉动单模板 臧学普 2024-11-09 17:48:24 +0800
• c7bbac33ab Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan jun 2024-11-08 15:49:59 +0800
• 4677552dfd 试制件工单新增问题修改 jun 2024-11-08 15:48:58 +0800
• e3ab160447 mes-ptr完善逻辑 臧学普 2024-11-08 11:32:04 +0800
• 748de5eeb9 修改线末大屏逻辑 臧学普 2024-11-07 20:28:36 +0800
• b16b0ed0bb Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 臧学普 2024-11-07 15:44:46 +0800
• ac38ee8ec3 mes-ptr完善逻辑 臧学普 2024-11-07 15:43:42 +0800
• 4eff9ea7c3 增加芜湖pisces数据源 jun 2024-11-07 14:27:48 +0800
• 548113c995 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan jun 2024-11-07 13:34:57 +0800
• 41830d2112 排序工单关闭，队列表也需要关闭 jun 2024-11-07 13:14:09 +0800
• 43f6a0a227 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 臧学普 2024-11-07 11:45:24 +0800
• c9b4a85176 修改产线后，解析异常 臧学普 2024-11-07 11:44:53 +0800