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

• e7de46442c 排序发运校验bug修复 jun 2024-06-20 17:40:24 +0800
• d693181dc7 Merge remote-tracking branch 'origin/dev' into dev jun 2024-06-20 17:27:48 +0800
• f55811f1ba 广乘-仪表打印模板增加客户物料字段 jun 2024-06-20 17:27:35 +0800
• 265bfafe24 step 王杰 2024-06-20 16:41:44 +0800
• 013650178c Merge remote-tracking branch 'origin/dev' into dev jun 2024-06-20 14:59:12 +0800
• 32eecc1d49 广乘-仪表打印模板 jun 2024-06-20 14:58:44 +0800
• 6122f1e074 打印调整数据结构 administrator 2024-06-20 14:43:42 +0800
• c82a59b86c 展示组件 微笑着面对明天 2024-06-20 14:33:54 +0800
• 5a62071de2 展示组件 微笑着面对明天 2024-06-20 14:33:15 +0800
• dc667158a1 Merge remote-tracking branch 'origin/dev' into dev administrator 2024-06-20 12:00:48 +0800
• 922cbf0d69 打印调整获取organizeName的取值 administrator 2024-06-20 11:54:23 +0800
• 63b6c88ae9 展示组件 微笑着面对明天 2024-06-19 22:18:15 +0800
• 042e582267 Merge remote-tracking branch 'origin/dev' into dev 微笑着面对明天 2024-06-19 21:12:49 +0800
• 5689b31564 展示组件 微笑着面对明天 2024-06-19 21:12:15 +0800
• df207217bd step 王杰 2024-06-19 20:19:33 +0800
• de49a8120d step 王杰 2024-06-19 19:55:42 +0800
• 02d5c0ed65 展示组件 微笑着面对明天 2024-06-19 17:52:27 +0800
• 2438909a65 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev gsz 2024-06-19 14:19:05 +0800
• 7233067964 41404 主工位与子工位【区域 产线 工位】参数校验 gsz 2024-06-19 14:19:00 +0800
• 628b8b1fc6 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 王杰 2024-06-19 11:13:38 +0800
• 2bbffee2ae steo 王杰 2024-06-19 11:13:32 +0800
• 72a53f0706 Merge remote-tracking branch 'origin/dev' into dev administrator 2024-06-19 01:51:03 +0800
• a7b4bc3e4d 报工 administrator 2024-06-19 01:45:39 +0800
• 32ef7b2a67 step 王杰 2024-06-19 01:43:44 +0800
• a586939520 Merge remote-tracking branch 'origin/dev' into dev administrator 2024-06-19 01:39:45 +0800
• d71a9a9856 展示组件 微笑着面对明天 2024-06-19 01:35:58 +0800
• 7621792533 step 王杰 2024-06-19 00:57:52 +0800
• e0fb916a90 Merge remote-tracking branch 'origin/dev' into dev administrator 2024-06-18 23:04:00 +0800
• f259900e87 step 王杰 2024-06-18 22:53:37 +0800
• 3c18ac6527 step 王杰 2024-06-18 22:34:40 +0800
• 22ccbe7a7f Merge remote-tracking branch 'origin/dev' into dev administrator 2024-06-18 22:27:04 +0800
• cf09ddad50 step 王杰 2024-06-18 22:23:30 +0800
• 3fc157fe8c Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 王杰 2024-06-18 22:18:40 +0800
• 523ebecc58 steop 王杰 2024-06-18 22:18:31 +0800
• 33e04796f1 展示组件 微笑着面对明天 2024-06-18 22:05:09 +0800
• fd2e5dc22e 打印主条码工步 administrator 2024-06-18 21:46:01 +0800
• 802342330d step 王杰 2024-06-18 21:25:46 +0800
• de1b3c22db step 王杰 2024-06-18 21:23:11 +0800
• b3a96c4387 Merge remote-tracking branch 'origin/dev' into dev administrator 2024-06-18 19:45:12 +0800
• 433d5eb232 step 王杰 2024-06-18 19:32:14 +0800
• 17838c071f 工步更新 微笑着面对明天 2024-06-18 18:55:12 +0800
• a4dd49bde5 Merge remote-tracking branch 'origin/dev' into dev administrator 2024-06-18 16:07:04 +0800
• 120dc75c05 step 王杰 2024-06-18 11:22:51 +0800
• 9afe79eaa9 step 王杰 2024-06-18 10:42:18 +0800
• f7adb7b1d5 step 王杰 2024-06-18 10:37:18 +0800
• a75f8ca290 打印主条码工步 administrator 2024-06-18 10:27:45 +0800
• 77e48610bf step 王杰 2024-06-18 10:13:38 +0800
• a4b9bdd253 展示组件 微笑着面对明天 2024-06-18 10:12:18 +0800
• 1d1abf5980 Merge remote-tracking branch 'origin/dev' into dev jun 2024-06-17 18:49:23 +0800
• 20f97e217c 装箱防错问题清单问题修复 jun 2024-06-17 18:49:06 +0800
• 7deb1c2b1a step 王杰 2024-06-17 16:54:58 +0800
• 46a130ebef 展示组件 微笑着面对明天 2024-06-17 15:43:42 +0800
• 083a33eb61 加工规则 微笑着面对明天 2024-06-17 15:37:25 +0800
• 93b4d3a395 41404 主工位与子工位修改 gsz 2024-06-17 15:30:52 +0800
• 8e90c343aa 开关班修改关班 gsz 2024-06-17 08:56:52 +0800
• d53b160e64 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev gsz 2024-06-17 08:49:54 +0800
• 3cd49fc831 step 王杰 2024-06-16 20:40:44 +0800
• fe4c3e36cf 展示组件 微笑着面对明天 2024-06-15 19:02:16 +0800
• 7567b037ca Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev gsz 2024-06-15 18:29:52 +0800
• b768644b40 工步修改 微笑着面对明天 2024-06-15 18:28:12 +0800
• a2f7150b13 Merge remote-tracking branch 'origin/dev' into dev jun 2024-06-15 17:55:07 +0800
• aa907b8fe5 问题清单问题修复 jun 2024-06-15 17:53:58 +0800
• 08c5ccdd3c step 王杰 2024-06-15 17:47:29 +0800
• f5f4560de2 pcn job 王杰 2024-06-15 10:31:01 +0800
• b42910d3a7 step 王杰 2024-06-15 10:14:21 +0800
• b846728201 工位按钮 提示信息 王杰 2024-06-14 22:24:08 +0800
• 778de8b8fe step 王杰 2024-06-14 21:31:08 +0800
• c160012a19 Merge remote-tracking branch 'origin/dev' into dev jun 2024-06-14 17:28:04 +0800
• 73b4b0d4d9 条码打印功能开发 jun 2024-06-14 17:27:37 +0800
• f787dfeaee 展示组件 微笑着面对明天 2024-06-14 16:39:33 +0800
• 9207a635de Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev 王杰 2024-06-14 14:02:03 +0800
• 4ce0fedc54 step 王杰 2024-06-14 14:01:58 +0800
• bff334f032 工步修改 微笑着面对明天 2024-06-14 13:12:35 +0800
• 7f6b9e8ece step 王杰 2024-06-14 12:36:07 +0800
• d42bba00d2 Merge remote-tracking branch 'origin/dev' into dev jun 2024-06-13 22:28:35 +0800
• 2a665781f6 PCN条码打印功能开发 jun 2024-06-13 22:28:16 +0800
• c3cb4cba96 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev gsz 2024-06-13 20:41:43 +0800
• c00cddc048 仪表读数job administrator 2024-06-13 20:13:56 +0800
• 8e349da2f7 Merge remote-tracking branch 'origin/dev' into dev administrator 2024-06-13 17:48:13 +0800
• c9a0c0e4ce 展示组件 微笑着面对明天 2024-06-13 09:16:46 +0800
• 0a6c10a3f7 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev gsz 2024-06-12 21:27:53 +0800
• 9ed84873f4 开关班修改关班 gsz 2024-06-12 21:27:38 +0800
• 8e6ce5711b 开关班修改关班 gsz 2024-06-12 21:27:19 +0800
• 74adc4830a 逻辑优化 jun 2024-06-12 21:25:48 +0800
• 782a9d2c84 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev gsz 2024-06-12 21:08:40 +0800
• 116cc57e1e 开关班修改关班 gsz 2024-06-12 21:08:25 +0800
• 0923b6bf6d Merge remote-tracking branch 'origin/dev' into dev jun 2024-06-12 19:54:46 +0800
• 650924be7c 逻辑变更 jun 2024-06-12 19:54:13 +0800
• 17f4d5593b 展示组件 微笑着面对明天 2024-06-12 19:52:58 +0800
• dde587d1b9 展示组件 微笑着面对明天 2024-06-12 19:15:23 +0800
• 7c5ab8a857 开关班记录新增唯一校验 gsz 2024-06-12 18:48:23 +0800
• 4d7072a12f 逻辑优化 jun 2024-06-12 18:37:36 +0800
• da3691af7b Merge remote-tracking branch 'origin/dev' into dev jun 2024-06-12 17:51:04 +0800
• cce62542f3 缺陷录入 jun 2024-06-12 17:50:47 +0800
• 06557113e6 展示组件 微笑着面对明天 2024-06-12 16:10:40 +0800
• 27335597ad step 王杰 2024-06-12 13:21:14 +0800
• f87e216c67 pcn 王杰 2024-06-12 13:15:38 +0800
• 9464ef33a7 包装定义维护扫描类别，零件号类别类型错误 jun 2024-06-12 11:28:41 +0800
• 349a2a0cf7 Merge remote-tracking branch 'origin/dev' into dev administrator 2024-06-11 18:26:31 +0800
• f1b3ed5929 演示功能修改 jun 2024-06-11 18:21:53 +0800