i3plus-mes-yfai

jiaxin.lin

i3plus-mes-yfai

forked from I3-YF/i3plus-mes-yfai

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

8f341689c9 Merge remote-tracking branch 'origin/dev' into dev jun 2024-08-01 19:56:26 +0800
9c7a954f2b 日志打印零件生产组生成工单时的时间臧学普 2024-08-01 19:01:44 +0800
ee50030890 产线与零件关系导入（产线名称改为产线代码） jun 2024-07-31 23:32:10 +0800
fad2cb5c66 修改bto生产工单的窗口提示信息 yfai-mes-ext-v1.1 臧学普 2024-07-31 20:41:09 +0800
8d48119572 查询客户排序信息时查询未解析过的数据臧学普 2024-07-31 20:24:27 +0800
1e77a3a7f5 产线看板-优化 logic.fang 2024-07-31 18:54:19 +0800
2d94c2c66d 问题清单修复 jun 2024-07-31 13:41:12 +0800
f8d371a3e2 Merge remote-tracking branch 'origin/dev' into dev jun 2024-07-30 16:56:10 +0800
c4d113ce05 问题清单修复 jun 2024-07-30 16:55:40 +0800
b08727bb82 系统配置查询方法王杰 2024-07-30 11:36:38 +0800
d81c9d9cc3 Merge remote-tracking branch 'origin/dev' into dev 臧学普 2024-07-29 20:16:58 +0800
ba4c03b843 更新bto按时圆整生成工单逻辑臧学普 2024-07-29 20:16:50 +0800
096835bd11 问题清单修复 jun 2024-07-29 19:04:41 +0800
0da6e7f2f6 mes报表验证分表配置王杰 2024-07-29 16:07:17 +0800
7e50e2cf37 mes报表验证分表配置王杰 2024-07-29 15:49:45 +0800
1390979630 Merge remote-tracking branch 'origin/dev' into dev 微笑着面对明天 2024-07-29 14:10:08 +0800
736ae7ebff 新增设备数据变量微笑着面对明天 2024-07-29 14:09:11 +0800
587502b2d8 代码回退，逻辑有变待确认 gsz 2024-07-29 10:11:36 +0800
786385b2e0 MES可疑品汇总修改返工数/不合格数/检验数量逻辑 gsz 2024-07-29 09:17:44 +0800
c0e3d72b51 问题清单修复 yfai-mes-ext-v1.0 jun 2024-07-28 00:22:38 +0800
0994b7ffaa MES可疑品汇总job修改汇总逻辑 gsz 2024-07-27 14:22:02 +0800
8d20f2ff9d 日志分表查询 bug 王杰 2024-07-26 16:33:26 +0800
7698c12158 MES可疑品汇总增加qms同步标志qmsSync gsz 2024-07-26 15:36:09 +0800
065b4241d9 42221 单件条码返工后报废 gsz 2024-07-26 14:38:06 +0800
b5a0c0d81a 问题清单修复 jun 2024-07-26 13:16:29 +0800
56ded2a6bc Merge remote-tracking branch 'origin/dev' into dev jun 2024-07-26 10:02:02 +0800
0989f3aeee 问题清单修复 jun 2024-07-26 09:59:16 +0800
2f65a4a093 设备日志报表增加分表查询字段王杰 2024-07-26 01:42:27 +0800
3a6248a1ea modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesWorkCellMonitorLogService.java 王杰 2024-07-26 01:39:33 +0800
fa51917ab3 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev gsz 2024-07-25 18:51:13 +0800
bfafa4206c ccsc汇总job 规则随机逻辑修改 gsz 2024-07-25 18:51:09 +0800
763ad4546c 问题清单修复 jun 2024-07-25 14:44:18 +0800
a6c1d5a485 CCSC检测，重新打开 jun 2024-07-25 13:47:53 +0800
86c9ec3ecf Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev gsz 2024-07-25 10:46:16 +0800
05bd490501 42189 零件扩展属性条码模板与零件条码规则匹配开发 gsz 2024-07-25 10:46:12 +0800
7de9fef630 问题清单修复 jun 2024-07-25 10:33:28 +0800
b55cbb30bc 问题清单修复 jun 2024-07-24 16:59:33 +0800
68bc7bc96a Merge remote-tracking branch 'origin/dev' into dev jun 2024-07-24 11:22:21 +0800
a5873a9388 问题清单修复 jun 2024-07-24 11:22:03 +0800
684d5ea5d9 产线看板-"单位小时完工率"与"产线一次下线合格率"部分的时间段排序优化 logic.fang 2024-07-24 11:11:01 +0800
4d68d813e3 Merge remote-tracking branch 'origin/dev' into dev logic.fang 2024-07-24 10:03:26 +0800
1de19ae114 问题清单修复 jun 2024-07-23 20:41:18 +0800
79c62b3d63 设备LOg变更字段王杰 2024-07-23 15:44:14 +0800
452e538823 设备LOg变更字段王杰 2024-07-23 15:43:56 +0800
ee3a6879cd 数据同步脚本 jun 2024-07-22 16:06:28 +0800
15debc5dfb mesmove 增加 erp生产线值王杰 2024-07-22 10:23:13 +0800
f3c87a4e87 导入模版王杰 2024-07-20 18:21:30 +0800
a42db56264 导入模版接口调整主数据下载模版时不能进行模糊查询王杰 2024-07-20 14:18:39 +0800
f4b0330b09 追溯报表王杰 2024-07-20 13:38:41 +0800
dd6836c891 追溯报表王杰 2024-07-20 13:37:18 +0800
e21607fe85 追溯报表王杰 2024-07-20 12:53:06 +0800
50fe1a10a5 问题清单修复 jun 2024-07-19 16:25:26 +0800
5e2d23b101 问题清单修复 jun 2024-07-19 16:10:32 +0800
27b4f49263 Merge branch 'dev' of C:\Code\IdeaProjects\yfai\YF\i3plus-mes-yfai with conflicts. logic.fang 2024-07-19 11:21:14 +0800
ddd22117b1 问题清单修复 jun 2024-07-18 21:19:55 +0800
c94dc6e14c 设备日志王杰 2024-07-18 17:29:02 +0800
3826df02ee mes枚举王杰 2024-07-18 15:48:35 +0800
ff001be549 Merge remote-tracking branch 'origin/dev' into dev jun 2024-07-18 14:57:00 +0800
3227ee65ca 问题清单修复 jun 2024-07-18 14:56:27 +0800
496b219fd7 媒体文件MesMediaFileCfgController crud gsz 2024-07-18 11:03:22 +0800
193e918dae 设备日志王杰 2024-07-17 16:54:19 +0800
29351f41cc mes 王杰 2024-07-17 14:23:48 +0800
f5af575513 设备日志王杰 2024-07-17 14:21:45 +0800
25ad2f58a7 问题清单修复 jun 2024-07-17 13:30:27 +0800
266ce66508 增加fid 臧学普 2024-07-17 11:11:58 +0800
acded409ab 注释掉obs相关接口，使用原有的文件管理系统臧学普 2024-07-17 10:15:04 +0800
f49cf4bbdb MES_QMS报废品汇总查同步标识为3的数据 gsz 2024-07-17 09:06:27 +0800
46a24a8e61 设备日志王杰 2024-07-16 18:28:21 +0800
b2a5acf45b 问题清单修复 jun 2024-07-16 17:58:08 +0800
abfb72759f Merge remote-tracking branch 'origin/dev' into dev jun 2024-07-16 17:54:57 +0800
5e2b921ee9 问题清单修复 jun 2024-07-16 17:52:46 +0800
7190b76438 mes execption 类变更路径王杰 2024-07-16 14:48:52 +0800
741ef4d549 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 王杰 2024-07-16 14:45:35 +0800
19f73ea5fe mes execption 类变更路径王杰 2024-07-16 14:45:28 +0800
80ade2b239 bug #41896 jun 2024-07-16 14:42:51 +0800
8142c2a990 问题清单修复 jun 2024-07-16 13:09:16 +0800
816ca4bec6 问题清单修复 jun 2024-07-15 19:39:16 +0800
d72767f2ac Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev gsz 2024-07-15 17:40:24 +0800
5063ba69aa MES2PISCES 装车单 gsz 2024-07-15 17:40:18 +0800
30d470f43c 导入和报工微笑着面对明天 2024-07-15 15:31:52 +0800
a63d7f4fb1 产线与零件关系查询条件无效问题修复王杰 2024-07-15 13:46:12 +0800
684977eefd bug 41915 jun 2024-07-15 10:55:50 +0800
8dd414182e 零件检验微笑着面对明天 2024-07-14 18:28:17 +0800
f42d9f4da2 MES2PISCES 发运单+装车单回传 gsz 2024-07-14 12:47:37 +0800
9dd5ceed60 自定义脚本 jun 2024-07-13 20:18:24 +0800
1b2f04fb6c 接口同步脚本 jun 2024-07-13 19:11:09 +0800
0578661a0e pieces2mes数据同步王杰 2024-07-13 17:58:37 +0800
5fb9194a20 接口调试增加脚本，FID jun 2024-07-13 13:23:22 +0800
7963cf5150 问题清单问题修复 jun 2024-07-12 16:29:36 +0800
c7d9ee47dd Merge remote-tracking branch 'origin/dev' into dev jun 2024-07-12 15:12:09 +0800
3139b7b7fd 工单同步 jun 2024-07-12 15:11:56 +0800
4f64cf83c5 pisces同步加工记录到mes 王杰 2024-07-12 15:04:33 +0800
f3e9c616bf Merge remote-tracking branch 'origin/dev' into dev jun 2024-07-11 18:34:09 +0800
6fb3bebb71 问题清单bug修复 jun 2024-07-11 18:31:07 +0800
9254ace3fc Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev administrator 2024-07-11 17:13:02 +0800
8950311d38 导入零件与产线关系 administrator 2024-07-11 17:02:47 +0800
9bcc7452f8 清除不用代码王杰 2024-07-10 18:28:33 +0800
704e3c30ce Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev administrator 2024-07-10 16:58:19 +0800
11a0cafc90 打印模板不区分工厂 jun 2024-07-10 16:45:15 +0800
f0da109d4c Merge remote-tracking branch 'origin/dev' into dev 微笑着面对明天 2024-07-10 15:12:55 +0800