jiaxin.lin
/
i3plus-mes-yfai
forked from I3-YF/i3plus-mes-yfai
1
0
Fork 0
Code Pull Requests Activity

Commit Graph

  • e3b7ef6664 Merge branch 'uat-temp-castle-2502071033-kitting' into dev 臧学普 2025-02-19 13:28:54 +0800
  • 52f362970a kitting 修复拉动组明细可以重复拉动零件 臧学普 2025-02-19 13:11:33 +0800
  • 975c4133c6 kitting单虚结构 臧学普 2025-02-18 17:27:25 +0800
  • dc78fc1e12 Merge branch 'dev-temp-xw-202502170000-45112' into dev xiangwei.zhang 2025-02-18 17:12:08 +0800
  • 053e9c77b9 45112 MES：发运明细报表需要按照客户要求到货时间筛选发运明细 xiangwei.zhang 2025-02-18 17:11:43 +0800
  • 2d2c63a850 Merge branch 'dev_temp_xw_202502120000_45071' into dev xiangwei.zhang 2025-02-18 16:46:05 +0800
  • 0bbe272234 45071 非排序 新增字段 顺序号（没填写则默认0），计划开始时间、计划结束时间 xiangwei.zhang 2025-02-18 16:44:37 +0800
  • 0344e04ab1 Merge remote-tracking branch 'origin/dev' into dev 臧学普 2025-02-18 16:12:33 +0800
  • 954bc8660c Merge branch 'uat-temp-castle-2502071033-kitting' into dev 臧学普 2025-02-18 16:11:56 +0800
  • af50e4cac2 插入工单时也需要校验是否生产kitting单 臧学普 2025-02-18 16:11:06 +0800
  • 080c7233b8 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 王杰 2025-02-18 15:59:47 +0800
  • 7470ab94bf Merge remote-tracking branch 'origin/uat-temp-nht-2502100000-45019' into dev 王杰 2025-02-18 15:59:36 +0800
  • 56e2819e42 成品包装规则 主数据维护 王杰 2025-02-18 15:57:43 +0800
  • 69cc48d7f9 Merge branch 'uat-temp-castle-2502071033-kitting' into dev 臧学普 2025-02-18 15:46:25 +0800
  • 0f2dce838d 关闭工单时需要校验拉动单是否需要关闭 臧学普 2025-02-18 15:45:52 +0800
  • b9c32f9a9e Merge branch 'uat-temp-castle-2502071033-kitting' into dev 臧学普 2025-02-18 15:08:50 +0800
  • f8914bebb5 Merge remote-tracking branch 'origin/dev' into dev xiangwei.zhang 2025-02-17 20:49:06 +0800
  • 3dbd65ab92 Merge branch 'dev-temp-xw-202502170000-45112' into dev xiangwei.zhang 2025-02-17 20:48:12 +0800
  • bb49d87d5a 45112 MES：发运明细报表需要按照客户要求到货时间筛选发运明细 xiangwei.zhang 2025-02-17 20:44:57 +0800
  • 86ece015df 修改pom 王杰 2025-02-17 16:41:45 +0800
  • 99a673e40d 修改pom 王杰 2025-02-17 16:40:01 +0800
  • 754f5cf033 修复bug 45097 工单装配件标增加打印模板和打印机名称赋值 臧学普 2025-02-14 17:26:01 +0800
  • 8026daaee8 Merge branch 'uat-temp-castle-2412251631-44430' into test yfai-mes-ext-v3.0 王杰 2025-02-14 14:42:03 +0800
  • 8600e15fe6 Merge remote-tracking branch 'origin/uat-temp-castle-2502070911-44952' into test 王杰 2025-02-14 14:34:16 +0800
  • df8a1eb60b 修改pom版本 王杰 2025-02-14 14:31:24 +0800
  • 15ef8073f7 合并 45106 MES-产品检验总报表问题 王杰 2025-02-14 14:25:31 +0800
  • ae830a3c9c 45106 MES-产品检验总报表问题 王杰 2025-02-14 14:20:21 +0800
  • 22948b56fb 修复bug 44248 https图片问题 uat-temp-castle-250211-44248 臧学普 2025-02-13 18:12:20 +0800
  • 39cfb67414 Merge remote-tracking branch 'origin/dev' into dev xiangwei.zhang 2025-02-12 20:54:00 +0800
  • 6f5ecda4aa Merge branch 'dev_temp_xw_202502120000_45071' into dev xiangwei.zhang 2025-02-12 20:53:22 +0800
  • d912b19680 45071 新增字段 顺序号（没填写则默认0），计划开始时间、计划结束时间 xiangwei.zhang 2025-02-12 20:52:23 +0800
  • eb5df895d2 修复bug 44248 https图片问题 臧学普 2025-02-12 17:55:27 +0800
  • 277ebd94e7 同步拉动单数据到wms中间表 臧学普 2025-02-11 18:59:18 +0800
  • daf654b481 45019 修改不可用规则维护功能 uat-temp-nht-2502100000-45019 Janson 2025-02-11 18:11:04 +0800
  • 6b82f97b73 45019 新增不可用规则维护功能 Janson 2025-02-11 16:17:39 +0800
  • 907adc5cf7 图片上传-44248 臧学普 2025-02-11 13:15:57 +0800
  • b63431ef8f 深汕kitting拉动完成 臧学普 2025-02-10 18:37:40 +0800
  • e8a6eb4eb2 merge uat-temp-pzj-250123-Assembly-Report 解决冲突 yfai-mes-ext-v2.9 王杰 2025-02-10 16:18:28 +0800
  • 8ddb559e36 Merge remote-tracking branch 'origin/dev-temp-xw-202501150000-44838' into test 王杰 2025-02-10 13:58:26 +0800
  • a99182a0a3 Merge branch 'uat-temp-wj-250206-45014' into dev 王杰 2025-02-10 12:00:25 +0800
  • 7c1e398550 Merge branch 'uat-temp-wj-250206-45014' into test 王杰 2025-02-10 11:58:57 +0800
  • aac1c5c970 45014 通用导出报表针对PTR替换的零件没有显示出来 王杰 2025-02-10 11:58:37 +0800
  • ae99dcbf12 Merge branch 'dev-temp-xw-202501150000-44838' into dev xiangwei.zhang 2025-02-10 11:49:01 +0800
  • 13e8e84e10 44838 MES:裁片补片逻辑更新＆裁片报表 xiangwei.zhang 2025-02-10 11:48:02 +0800
  • c147289e65 Merge remote-tracking branch 'origin/uat-temp-pzj-250123-Assembly-Report' into test 王杰 2025-02-10 11:35:03 +0800
  • 0b61c7a143 Merge remote-tracking branch 'origin/dev-temp-xw-202501150000-44838' into test 王杰 2025-02-10 11:27:01 +0800
  • f47eb3accd Merge remote-tracking branch 'origin/uat-temp-wj-250122-44907' into test 王杰 2025-02-10 11:22:20 +0800
  • 3530a65d0c Merge remote-tracking branch 'origin/dev-temp-xw-202502100000-44915' into test 王杰 2025-02-10 11:19:32 +0800
  • 17e7e2dd45 44915 排序加工规则列表增加车型代码、车型大类代码、扫描规则展示，增加车型代码、车型大类名称搜索条件 xiangwei.zhang 2025-02-10 11:18:22 +0800
  • b98710fa96 Merge remote-tracking branch 'origin/dev_temp-xw-202502100000-44985' into test 王杰 2025-02-10 11:10:43 +0800
  • 7ca161a717 44985 离线排序加工规则job执行后没有生成对应数据 xiangwei.zhang 2025-02-10 11:09:49 +0800
  • e736d7b591 Merge remote-tracking branch 'origin/uat-temp--logic-20250208-44991' into test 王杰 2025-02-10 11:00:06 +0800
  • da09e0afaf 44863 PCN-零件生产组增加“使用BOM方式”枚举最终确认版逻辑优化 xiangwei.zhang 2025-02-10 10:58:08 +0800
  • 7f517a0a51 Merge remote-tracking branch 'refs/remotes/origin/uat-temp--logic-20250208-44991' into dev logic.fang 2025-02-08 14:37:23 +0800
  • cf1c76b57e 44991 产线看板问题（10点正以后才能看到8-9点的报工数据） logic.fang 2025-02-08 14:29:10 +0800
  • d7377fa4c6 深汕kitting拉动,按数量完成 臧学普 2025-02-08 11:42:54 +0800
  • 9543a7a674 深汕kitting拉动,按套完成 臧学普 2025-02-07 20:07:48 +0800
  • 3e735d98cb Merge remote-tracking branch 'origin/dev' into dev xiangwei.zhang 2025-02-07 18:09:06 +0800
  • 4debdd0b55 Merge branch 'dev_temp_xw_202502070000_44985' into dev xiangwei.zhang 2025-02-07 18:07:31 +0800
  • fde75716bc 44985 离线排序加工规则job执行后没有生成对应数据 xiangwei.zhang 2025-02-07 18:06:48 +0800
  • 628592c67a 44939 装配件报表查询优化 pzj 2025-02-07 16:37:26 +0800
  • 00a33f9bde Merge remote-tracking branch 'origin/uat-temp-nht-2502060000-44953' into dev Janson 2025-02-07 10:38:00 +0800
  • 3ff9564b61 44953 新增条码打印模板的字段支持自定义配置 Janson 2025-02-07 10:25:36 +0800
  • 29b78d3385 Merge branch 'uat-temp-castle-2502070911-44952' into dev 臧学普 2025-02-07 09:54:45 +0800
  • deff0ac43b fix bug 44952 MES-零件生产组明细、零件发运组明细、客户车型配置明细输入客户零件号后将零件号带出来 臧学普 2025-02-07 09:35:13 +0800
  • 47e19bf5fd Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 王杰 2025-02-06 16:32:42 +0800
  • 246f342b7e 升级mes 核心包pom版为1.0.1-yfai 王杰 2025-02-06 16:32:35 +0800
  • 85ef2dd7cf Merge remote-tracking branch 'origin/dev' into dev pzj 2025-02-06 14:26:07 +0800
  • d751010c52 Merge branch 'uat-temp-wj-250124-equ-check-step' into dev 王杰 2025-02-06 09:40:12 +0800
  • 123ac16c08 红外焊超差预警 uat-temp-wj-250124-equ-check-step 王杰 2025-02-05 21:20:28 +0800
  • ed7863b633 Merge branch 'dev-temp-xw-202501150000-44838' into dev xiangwei.zhang 2025-02-05 18:20:07 +0800
  • 756bfeeea6 44838 MES:裁片补片逻辑更新＆裁片报表 xiangwei.zhang 2025-02-05 18:19:25 +0800
  • 400ae3500c Merge branch 'dev' into uat-temp-pzj-250123-Assembly-Report pzj 2025-02-05 09:11:14 +0800
  • d4e58b6449 装配件报表 pzj 2025-02-05 09:05:14 +0800
  • c600dbedf7 44915 排序加工规则列表增加车型代码、车型大类代码、扫描规则展示，增加车型代码、车型大类名称搜索条件 xiangwei.zhang 2025-01-25 12:54:00 +0800
  • a0e07ca940 44915 排序加工规则列表增加车型代码、车型大类代码、扫描规则展示，增加车型代码、车型大类名称搜索条件 xiangwei.zhang 2025-01-25 12:52:48 +0800
  • 599ae54988 Merge branch 'test-temp-wj-250117-pack' into dev 王杰 2025-01-23 09:41:15 +0800
  • 58f87b6e85 打包 王杰 2025-01-23 09:41:01 +0800
  • 4cf0a5a7b9 Merge branch 'test-temp-wj-250117-pack' into dev 王杰 2025-01-23 09:35:16 +0800
  • fdae8a1b45 Merge branch 'uat-temp-wj-250122-44907' into dev 王杰 2025-01-22 20:37:09 +0800
  • fb9282ed55 44907 MES：检验产品数据总报表报错 王杰 2025-01-22 20:35:44 +0800
  • 9bd8ecee92 Merge branch 'uat-temp-xw-202501200000-44905' into dev xiangwei.zhang 2025-01-21 22:50:38 +0800
  • fba028267d 44905 MES-发运异常处理 xiangwei.zhang 2025-01-21 22:49:32 +0800
  • 58ea818942 Merge branch 'uat-temp-xw-202501200000-44905' into dev xiangwei.zhang 2025-01-21 22:36:02 +0800
  • 5fcef2d14f 44905 MES-发运异常处理 xiangwei.zhang 2025-01-21 22:35:28 +0800
  • c3abf292e1 Merge branch 'uat-temp-xw-202501200000-44905' into dev xiangwei.zhang 2025-01-21 22:03:34 +0800
  • a4d6e8009a 44905 MES-发运异常处理 xiangwei.zhang 2025-01-21 22:02:58 +0800
  • 890bd1472b Merge branch 'uat-temp-xw-202501200000-44905' into dev xiangwei.zhang 2025-01-21 20:41:29 +0800
  • 939c515fc2 44905 MES-发运异常处理 xiangwei.zhang 2025-01-21 20:40:09 +0800
  • 10456e74a9 Merge branch 'uat-temp-xw-202501200000-44905' into dev xiangwei.zhang 2025-01-21 19:46:56 +0800
  • 463ec92cbf 44905 MES-发运异常处理 xiangwei.zhang 2025-01-21 19:46:23 +0800
  • 6b5432d5b9 Merge branch 'uat-temp-xw-202501200000-44905' into dev xiangwei.zhang 2025-01-20 19:23:38 +0800
  • be1749fb92 44905 MES-发运异常处理 xiangwei.zhang 2025-01-20 19:14:13 +0800
  • 6ef72a6bee 打包 王杰 2025-01-20 17:20:25 +0800
  • 3c7d252537 Merge branch 'dev-temp-xw-202501150000-44838' into dev xiangwei.zhang 2025-01-20 14:46:54 +0800
  • b633fbaeb9 44838 MES:裁片补片逻辑更新＆裁片报表 xiangwei.zhang 2025-01-20 14:46:28 +0800
  • d152a464ca 打包 王杰 2025-01-20 14:02:29 +0800
  • 08301bc9a2 44905 MES-发运异常处理 xiangwei.zhang 2025-01-20 13:47:11 +0800
  • e834732d74 44838 MES:裁片补片逻辑更新＆裁片报表 xiangwei.zhang 2025-01-20 10:03:00 +0800
  • ec7f396e33 重庆打包 王杰 2025-01-17 11:27:08 +0800