Commit Graph

Select branches

Hide Pull Requests

dev

dev-temp-nht-202501160000-44744

dev-temp-nht-202502180000-customprint

dev-temp-xw-202501150000-44838

dev-temp-xw-202502050000-44881

dev-temp-xw-202502170000-111111

dev-temp-xw-202502170000-45135

dev_temp_xw202503020000_45316

dev_temp_xw_202503100000_45411

dev_temp_xw_202503120000_45558

master

test

test-demp-ljs-202501181621-44904

test-temp-wj-250117-pack

test-temp-wj-2501170000-44435

test-temp-wj-45329

uat

uat-temp-castle-250209-kitting

uat-temp-castle-250211-44248

uat-temp-castle-2502241152-fordFetchWeb

uat-temp-logic-20250307-45527

uat-temp-logic-20250309-45550

uat-temp-nht-202502180000-shippingkanban

uat-temp-nht-202502260000-customprint

uat-temp-nht-202502270000-45335

uat-temp-nht-2502060000-44953

uat-temp-nht-2502110000-45028

uat-temp-nht-2502110000-chongqing-step

uat-temp-nht-2502140000-part-print

uat-temp-nht-2502200000-lijia-sn-print

uat-temp-nht-250226-lijia

uat-temp-nht-25027-chengdu

uat-temp-nht-2503100000-45420

uat-temp-nht-2503100000-45560

uat-temp-nht-2503110000-45555

uat-temp-nht-2503110000-45556

uat-temp-nht-2503130000-chengdu-shipping

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

uat-temp-wj-2502060000-chongqing-step

uat-temp-wj-250208-44424

uat-temp-wj-250208-manycellbug

uat-temp-wj-250210-45015

uat-temp-wj-chongqingdaqu

uat-temp-wj-chongqingdaqu-dev

uat-temp-wj-chongqingdaqu-dev-temp-logic-20250313-45623

uat-temp-wj-chongqingdaqu-prod

uat-temp-wj-lijia-prod

uat-temp-wj-longxin-prod

uat-temp-wj-shenshanorder

uat-temp-xw-202501250000-44863

uat-temp-xw-20250220-45119

uat-work-order-temp

uat_temp-xw-202502110000-45034

uat_temp_castle_250213_44248

uat_temp_xw_202502100000_44424

yfai-pcn-ext-v1.0

yfai-pcn-ext-v1.1

yfai-pcn-ext-v1.2

yfai-pcn-ext-v1.3

yfai-pcn-ext-v1.4

yfai-pcn-ext-v1.5

yfai-pcn-ext-v1.6

yfai-pcn-ext-v1.7

yfai-pcn-ext-v1.8

yfai-pcn-ext-v1.9

yfai-pcn-ext-v2.0

yfai-pcn-ext-v2.1

yfai-pcn-ext-v2.2

yfai-pcn-ext-v2.3

yfai-pcn-ext-v2.4

yfai-pcn-ext-v2.5

yfai-pcn-ext-v2.51

yfai-pcn-ext-v2.6

yfai-pcn-ext-v2.7

yfai-pcn-ext-v2.75

yfai-pcn-ext-v2.76

yfai-pcn-ext-v2.8

yfai-pcn-ext-v2.81

yfai-pcn-ext-v2.82

yfai-pcn-ext-v2.9

yfai-pcn-ext-v3.1

yfai-pcn-ext-v3.11

yfai-pcn-ext-v3.2

Mono Color

• c82473c72a 排序 装配件前置写库 王杰 2024-10-18 15:55:11 +0800
• b170bd66f2 代码优化 王杰 2024-10-18 14:32:17 +0800
• e1c3021899 代码优化 王杰 2024-10-18 14:29:28 +0800
• 7993912d8b merge dev-wuhan 王杰 2024-10-18 13:57:59 +0800
• b7b4ecb676 merge dev 王杰 2024-10-18 13:55:52 +0800
• 5af8d8faf8 Merge branch 'dev-wuhan' into dev-wuhan-temp 王杰 2024-10-18 13:40:23 +0800
• 172047542c Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan jun 2024-10-18 13:37:31 +0800
• 176fb4505f 应急件库位管理开发 jun 2024-10-18 13:37:01 +0800
• 253b5fd638 Merge branch 'dev-wuhan-temp' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan-temp 王杰 2024-10-18 13:16:13 +0800
• 0d1769c17c 排序 装配件 前置写库 王杰 2024-10-18 13:16:07 +0800
• 7a1b06614d 优化电测试-增加生产记录修改 臧学普 2024-10-18 11:56:42 +0800
• bd26b7762b 设备停机修改 yfai-pcn-ext-v2.2 xiangwei.zhang 2024-10-18 11:22:14 +0800
• 5b773eb9b5 排序 装配件 实时落库 王杰 2024-10-18 10:56:47 +0800
• d8affd4048 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 臧学普 2024-10-17 15:55:21 +0800
• ec226284ea 优化电测试-增加生产记录 臧学普 2024-10-17 15:54:02 +0800
• 0fe1ca2ebf JIS拉动，要加跳过码，标记是跳过的 jun 2024-10-17 15:27:29 +0800
• 3a187b0bf1 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan jun 2024-10-17 09:04:08 +0800
• 3752c50f24 生产过程控制，排序加工单显示(跳号标黄色) jun 2024-10-17 09:03:50 +0800
• d3b21da384 Merge branch 'dev-wuhan' into dev-wuhan-temp 王杰 2024-10-16 19:29:15 +0800
• 7e7304ec8d 排序 装配件 问题 王杰 2024-10-16 19:28:43 +0800
• d709c834d5 Merge branch 'dev-wuhan' into dev-wuhan-temp jun 2024-10-16 16:53:28 +0800
• 54caad459e Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 臧学普 2024-10-16 16:47:59 +0800
• 409c979c0e 优化电测试 臧学普 2024-10-16 16:47:49 +0800
• aff7c237e9 设备停机修改 xiangwei.zhang 2024-10-16 16:17:25 +0800
• 428a3d8884 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan jun 2024-10-16 16:03:55 +0800
• 5c758f33c0 生产过程控制，标黄的是跳号的工单，而不是有跳过的工单。 jun 2024-10-16 16:02:44 +0800
• 31de710227 客户条码补打 jun 2024-10-16 15:57:56 +0800
• 5bfb403b48 Merge branch 'dev-wuhan' into dev-wuhan-temp 王杰 2024-10-16 15:47:53 +0800
• e92c29a07a 装配件扫描 置顶 王杰 2024-10-16 15:46:50 +0800
• b8ec695def 电测试 臧学普 2024-10-15 21:31:09 +0800
• 2ab2ecdb80 电测试 臧学普 2024-10-15 19:56:27 +0800
• e6aa6deb48 流程包含解绑工步[工步参数]逻辑优化 jun 2024-10-15 16:14:51 +0800
• 8419842a17 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan-temp jun 2024-10-15 14:52:32 +0800
• e67dd0fe8d Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan jun 2024-10-15 14:50:13 +0800
• e531d140ae CBR,排序报工逻辑调整 jun 2024-10-15 14:48:23 +0800
• 34e0e40256 Merge branch 'dev-wuhan' into dev-wuhan-temp 王杰 2024-10-15 13:31:05 +0800
• c7a5f904a0 代码优化 王杰 2024-10-15 13:29:41 +0800
• b118f22767 Merge branch 'master' into dev-wuhan-temp 王杰 2024-10-15 13:26:53 +0800
• 5ab9d9098b 工艺参数完成 动态sql写入 王杰 2024-10-15 13:26:03 +0800
• 8cb8b90b15 SPS拉动不校验强过顺序的 gsz 2024-10-15 11:58:07 +0800
• 5bd431ac55 装配件显示 列增加配置 王杰 2024-10-15 09:56:57 +0800
• 7a4df0d184 排序发运逻辑调整 jun 2024-10-12 19:40:13 +0800
• 254687ff81 第一次记录加工记录，同步标识应该为2 jun 2024-10-12 15:38:31 +0800
• e8b651168f Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 臧学普 2024-10-12 15:12:11 +0800
• 1ebb40569f 电测试 臧学普 2024-10-12 15:12:03 +0800
• 8d832557c4 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan gsz 2024-10-12 15:06:04 +0800
• 84e6e65172 SPS单据打印插入PrintedSnLog表 gsz 2024-10-12 15:05:59 +0800
• be37923e97 排序报工演示问题修复 jun 2024-10-12 14:55:58 +0800
• f30dea31ba 合并广州代码 xiangwei.zhang 2024-10-12 11:44:58 +0800
• a2c4488860 Merge branch 'dev' into dev-wuhan xiangwei.zhang 2024-10-12 11:22:02 +0800
• 8cce62b47d Merge branch 'dev-wuhan' into dev-wuhan-temp 王杰 2024-10-11 23:28:51 +0800
• fbf1bfce20 装配件排序 王杰 2024-10-11 23:28:09 +0800
• 441d28d2e1 Merge branch 'dev-wuhan' into dev-wuhan-temp 王杰 2024-10-11 21:50:41 +0800
• 27086124ae 装配件工步调整 王杰 2024-10-11 21:48:19 +0800
• b32bef4d09 装配件整腔跳过ug 王杰 2024-10-11 17:34:45 +0800
• 48f0360fb8 加工记录时间加毫秒，客退品和电子化检验查询串的问题修改 yfai-pcn-ext-v2.1 xiangwei.zhang 2024-10-11 16:43:03 +0800
• 2d8901489d Merge branch 'dev-wuhan' into dev-wuhan-temp 王杰 2024-10-11 13:43:37 +0800
• 8cafc24d35 装配件整腔跳过 王杰 2024-10-11 13:43:11 +0800
• d4102a5fcf Merge branch 'dev-wuhan' into dev-wuhan-temp 王杰 2024-10-11 13:14:34 +0800
• 5f604adc9d 显示前道所有装配件 王杰 2024-10-11 13:14:15 +0800
• f3b4e08a10 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan gsz 2024-10-11 11:06:56 +0800
• 4a72b849e9 JIS拉动组规则校验 gsz 2024-10-11 11:06:50 +0800
• b741c1deb5 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan jun 2024-10-11 10:57:10 +0800
• 1a4c94f88a getById方法增加organizeCode条件 jun 2024-10-11 10:55:58 +0800
• c419399787 Merge branch 'dev-wuhan' into dev-wuhan-temp 王杰 2024-10-11 10:54:34 +0800
• 860b4d9c49 Merge branch 'dev-wuhan' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan 王杰 2024-10-11 10:54:06 +0800
• 53ba608c16 打印 王杰 2024-10-11 10:53:57 +0800
• 265f4ef7dc 排序展示组件 展示工单序号 yxw 2024-10-11 10:34:43 +0800
• ab8cb55e4a Merge branch 'dev-wuhan' into dev-wuhan-temp 王杰 2024-10-11 09:38:09 +0800
• 84436a5b0f 修复产品加工记录 数据覆盖 没有新增的问题 王杰 2024-10-11 09:37:45 +0800
• fdf8c283e8 设备日志明细分表 王杰 2024-10-11 08:18:49 +0800
• c0feb1dde4 排序发运逻辑调整 jun 2024-10-10 19:56:29 +0800
• c45b5724f6 暂时注释掉webservice 臧学普 2024-10-10 19:35:45 +0800
• c301a99fd2 Merge remote-tracking branch 'origin/dev' into dev xiangwei.zhang 2024-10-10 16:30:18 +0800
• 9a20923aa9 判断可疑 xiangwei.zhang 2024-10-10 16:29:38 +0800
• fa064ebd7d 打印策略 零件条码编码规则 字段用错 王杰 2024-10-10 16:24:19 +0800
• 01dac4fe8c 初始化料筒修改 gsz 2024-10-10 16:21:30 +0800
• f3e2254e45 电测试开发 臧学普 2024-10-10 15:20:22 +0800
• 14817b8d61 Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan 臧学普 2024-10-10 15:20:15 +0800
• 0bdce60c37 Merge branch 'master' into dev-wuhan-temp 王杰 2024-10-10 15:04:29 +0800
• 2ef09dee56 mes_equipment_log mes_work_cell_scan_monitor_log 分表动态sql ； 支持云工厂分表 王杰 2024-10-10 15:03:48 +0800
• 630ac61e31 SPS打印增加打印时间 gsz 2024-10-10 15:00:18 +0800
• c82eb99317 判断可疑 xiangwei.zhang 2024-10-10 11:09:29 +0800
• 94c320d2cb 排序发运逻辑调整 jun 2024-10-10 11:05:38 +0800
• 31072fac39 排序展示组件报错 yxw 2024-10-10 10:55:53 +0800
• ad2a7f8722 电测试开发 臧学普 2024-10-10 10:44:05 +0800
• 8252c90f03 裁片原材料防错 yxw 2024-10-10 10:32:04 +0800
• 09b9c21a47 发运明细顺序校验逻辑调整 jun 2024-10-09 18:44:28 +0800
• 082e83a94a 排序发运逻辑调整 jun 2024-10-09 18:41:28 +0800
• 1ae36b99e2 发运数据double jun 2024-10-09 15:09:39 +0800
• d035447f29 报工增加bom总行数字段 jun 2024-10-09 14:48:07 +0800
• 838d1f82db merge dev 冲突解决 王杰 2024-10-09 13:15:36 +0800
• 8930187f6f 代码优化 王杰 2024-10-09 12:52:50 +0800
• 23b774af3a 工单修改工步 修改方式变更 王杰 2024-10-09 10:55:50 +0800
• 893f307284 工单修改工步， 修改方式调整 王杰 2024-10-08 22:43:46 +0800
• 4d9d03725b Merge remote-tracking branch 'origin/dev-wuhan' into dev-wuhan jun 2024-10-08 18:39:23 +0800
• 24d2cd89e6 非排序报工功能开发（代码调整） jun 2024-10-08 18:38:19 +0800
• d708e96d46 非排序报工功能开发 jun 2024-10-08 18:36:36 +0800
• 7343c0e462 判断可疑 xiangwei.zhang 2024-10-08 18:25:26 +0800
• 80677847b1 Merge branch 'dev-wuhan' into dev-wuhan-temp 王杰 2024-10-08 15:14:12 +0800