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

Commit Graph

  • e970034c9e Merge branch 'uat-temp-wj-chongqingdaqu-dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into uat-temp-wj-chongqingdaqu-dev uat-temp-wj-chongqingdaqu-dev 王杰 2025-03-17 16:17:13 +0800
  • 4a43ad748f 龙兴发运单 王杰 2025-03-17 16:17:07 +0800
  • eb048b20ba 成都发运创建asn问题修复 uat-temp-nht-2503130000-shipping jason 2025-03-17 14:57:59 +0800
  • 0efed6c641 成都发运代码提交 jason 2025-03-17 11:47:01 +0800
  • bd4afd9deb 45656 MES-批量报工，相同的bom_code、bom_version，不同的生效时间两套bom，报工时造成双倍消耗 dev_temp_xw_202503170000_45656 xiangwei.zhang 2025-03-17 10:59:16 +0800
  • afc3e92911 Merge branch 'uat-temp-nht-2503130000-shipping' into uat-temp-wj-chongqingdaqu-dev jason 2025-03-17 10:17:27 +0800
  • aeeaa69847 排序发运打印 龙兴 王杰 2025-03-17 09:24:59 +0800
  • 28e3e82a42 成都发运，临时提交 jason 2025-03-17 03:09:56 +0800
  • 1792859241 Merge remote-tracking branch 'origin/uat-temp-nht-chengdu-loading' into uat-temp-wj-chongqingdaqu-dev 王杰 2025-03-15 21:58:48 +0800
  • ed4e5031e9 成都装车单打印，临时提交 uat-temp-nht-chengdu-loading jason 2025-03-15 21:10:21 +0800
  • 32838a59c6 Merge remote-tracking branch 'origin/uat-temp-nht-chengdu-loading' into uat-temp-wj-chongqingdaqu-dev 王杰 2025-03-15 18:50:51 +0800
  • fbdadc86ae 成都装车单打印，临时提交 jason 2025-03-15 18:49:45 +0800
  • 7349798613 merge 装车单打印 王杰 2025-03-15 18:45:14 +0800
  • dc3f83357e merge MES: 赛力斯6个报表开发 王杰 2025-03-15 18:43:54 +0800
  • 39a705b436 Merge remote-tracking branch 'origin/uat-temp-nht-chengdu-loading' into uat-temp-nht-chengdu-loading jason 2025-03-15 16:54:02 +0800
  • 21119ccdaa 成都装车单打印，临时提交 jason 2025-03-15 16:52:51 +0800
  • 05fa108128 成都装车单打印，临时提交 jason 2025-03-15 16:52:51 +0800
  • a91b404721 Merge branch 'uat-temp-wj-chongqingdaqu-dev' into uat-temp-nht-chengdu-loading jason 2025-03-15 16:52:11 +0800
  • 27fc494cb7 成都装车单打印，临时提交 jason 2025-03-15 16:50:37 +0800
  • a5290282ac 成都装车单打印，临时提交 jason 2025-03-15 16:28:08 +0800
  • 8bd8fb0ee8 龙兴发运单 王杰 2025-03-15 16:28:07 +0800
  • 04df421e48 pom 王杰 2025-03-15 15:49:32 +0800
  • 12402b188c 龙兴发运单 王杰 2025-03-15 15:31:09 +0800
  • 87e3a192a2 Merge remote-tracking branch 'origin/uat-temp-logic-20250313-45610' into uat-temp-wj-chongqingdaqu-dev 王杰 2025-03-15 12:27:38 +0800
  • 84650598c9 成都发运，临时提交 uat-temp-nht-2503130000-chengdu-shipping jason 2025-03-14 21:48:17 +0800
  • d417f0aa7b 成都发运，临时提交 jason 2025-03-14 18:04:55 +0800
  • 0ce448b40f Merge branch 'uat-temp-wj-chongqingdaqu-prod' into uat-temp-wj-chongqingdaqu-dev 王杰 2025-03-13 16:53:30 +0800
  • 32e010665d Merge branch 'uat' into uat-temp-wj-chongqingdaqu-prod uat-temp-wj-chongqingdaqu-prod 王杰 2025-03-13 16:53:13 +0800
  • c99e80085d 45631 广州有2套不同生产版本bom导致多报工问题 yfai-mes-ext-v3.3 uat test dev_temp_xw_202503120000_45631 xiangwei.zhang 2025-03-13 16:52:09 +0800
  • c2c9b5bc75 45631 广州有2套不同生产版本bom导致多报工问题 xiangwei.zhang 2025-03-13 16:50:54 +0800
  • 5132ae0f10 45610 发运界面增加发运单补打功能 uat-temp-logic-20250313-45610 logic.fang 2025-03-13 15:40:36 +0800
  • 3be4afacb7 Merge branch 'dev_temp_xw_202503120000_45631' into dev dev xiangwei.zhang 2025-03-12 22:28:44 +0800
  • 1d346854cc 45631 广州有2套不同生产版本bom导致多报工问题 xiangwei.zhang 2025-03-12 22:10:28 +0800
  • 69c1513e97 Merge branch 'uat-temp-wj-chongqingdaqu-prod' into uat-temp-wj-chongqingdaqu-dev 王杰 2025-03-12 19:43:03 +0800
  • 3653bd4c35 Merge branch 'uat' into uat-temp-wj-chongqingdaqu-prod 王杰 2025-03-12 19:42:28 +0800
  • 832568023d Merge remote-tracking branch 'origin/uat-temp-wj-custpartservice_four' into test 王杰 2025-03-12 19:41:22 +0800
  • 1dbefd1d8c Merge remote-tracking branch 'origin/uat-temp-xw-202501200000-44905' into test 王杰 2025-03-12 19:36:22 +0800
  • d1a18699c8 龙兴客户条码, 改动影响武汉 王杰 2025-03-12 16:50:06 +0800
  • 00cd582ce5 Merge remote-tracking branch 'origin/dev_temp_xw_20250305_45455' into uat-temp-wj-chongqingdaqu-dev 王杰 2025-03-12 11:18:01 +0800
  • 7d50b24299 Merge remote-tracking branch 'origin/uat-temp-nht-2503040000-seres' into dev jason 2025-03-11 18:37:16 +0800
  • 4f20a0d416 Merge remote-tracking branch 'origin/uat-temp-nht-2503110000-45549' into dev jason 2025-03-11 18:24:09 +0800
  • 255cb7db32 修复Bug：45549，增加过账日期起始-过账日期截止的 查询条件 jason 2025-03-11 14:54:40 +0800
  • b8a34c8e48 Merge remote-tracking branch 'origin/uat-temp-wj-250124-equ-check-step' into uat-temp-wj-chongqingdaqu-prod 王杰 2025-03-11 11:19:51 +0800
  • 002ea6bf2d 解决冲突 王杰 2025-03-11 11:19:23 +0800
  • 615f2b276b Merge remote-tracking branch 'origin/uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 王杰 2025-03-11 11:18:27 +0800
  • 0e8ede0689 Merge remote-tracking branch 'origin/uat-temp-wj-custpartservice_four' into uat-temp-wj-chongqingdaqu-prod 王杰 2025-03-11 11:16:15 +0800
  • ea4076a106 Merge :remote-tracking branch 'origin/uat-temp-castle-250211-44248' into uat-temp-wj-chongqingdaqu-prod 王杰 2025-03-11 11:09:49 +0800
  • e0b68ec5b9 Merge remote-tracking branch 'origin/uat-temp-nht-2502100000-45019' into uat-temp-wj-chongqingdaqu-prod 王杰 2025-03-11 11:06:20 +0800
  • b1909674c8 Merge remote-tracking branch 'origin/dev-temp-xw-202501031219-44700' into uat-temp-wj-chongqingdaqu-prod 王杰 2025-03-11 10:51:42 +0800
  • acb394bb6b 修复赛力斯报表查询问腿 uat-temp-nht-2503040000-seres jason 2025-03-10 21:17:55 +0800
  • 626f1efd0d 修复赛力斯报表查询问腿 jason 2025-03-10 18:17:44 +0800
  • ae983b2b40 根据配置新增工位按钮 接口地址单词写错 uat-temp-wj-2502060000-chongqing-step 王杰 2025-03-10 12:24:40 +0800
  • acf5e70b5d Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 王杰 2025-03-10 10:57:42 +0800
  • 5bba6ba515 Merge branch 'uat-temp-wj-custpartservice_four' into dev 王杰 2025-03-10 10:56:01 +0800
  • e8de99d38f 零件发运组明细 新增 查询客户物料号 回车无数据问题临时处理(热部署云正式) 最终合并版本 王杰 2025-03-10 10:54:30 +0800
  • fe6ba8e8cf 新增看板 jason 2025-03-07 10:14:18 +0800
  • 85280e5c98 Merge branch 'dev_temp_xw_20250305_45455' into dev xiangwei.zhang 2025-03-06 15:37:00 +0800
  • 66f4b12999 45455 裁片生产过程控制，产品加工记录数量保存数据不对 dev_temp_xw_20250305_45455 xiangwei.zhang 2025-03-06 15:36:34 +0800
  • 6f292e8842 新增看板 jason 2025-03-06 14:16:39 +0800
  • 9a432311e3 45455 裁片生产过程控制，产品加工记录数量保存数据不对 xiangwei.zhang 2025-03-05 20:31:20 +0800
  • c5e1bf8cbc Merge remote-tracking branch 'origin/dev' into dev xiangwei.zhang 2025-03-05 19:25:10 +0800
  • 3d02c9b4a9 Merge branch 'dev_temp_xw_20250305_45455' into dev xiangwei.zhang 2025-03-05 19:24:43 +0800
  • 4af1337a7f 45455 裁片生产过程控制，产品加工记录数量保存数据不对 xiangwei.zhang 2025-03-05 19:23:18 +0800
  • ec571d1bbc 45455 裁片生产过程控制，产品加工记录数量保存数据不对 xiangwei.zhang 2025-03-05 19:03:25 +0800
  • 72e51a2bf1 45455 裁片生产过程控制，产品加工记录数量保存数据不对 xiangwei.zhang 2025-03-05 15:45:20 +0800
  • c307a62832 重庆大区代码合并 解决冲突 王杰 2025-03-05 14:18:36 +0800
  • 05209424ce Merge remote-tracking branch 'origin/uat-temp-xw-202501200000-44905' into dev jason 2025-02-27 17:31:27 +0800
  • bc8cc74021 增加发运单异常处理同步发运零件号及条码卡控 jason 2025-02-27 17:30:31 +0800
  • f389b546d6 Merge branch 'test-temp-wj-interface-mapper' into dev 王杰 2025-02-27 11:44:03 +0800
  • 1a377bb99e Merge branch 'test' into test-temp-wj-interface-mapper yfai-mes-ext-v3.2 王杰 2025-02-27 11:32:45 +0800
  • af7cf44328 Merge remote-tracking branch 'origin/uat-temp-xw-202501200000-44905' into test 王杰 2025-02-27 11:22:19 +0800
  • c55224a658 接口映射 增加 4,5,6 数据源 王杰 2025-02-26 18:16:00 +0800
  • 7bf43e5eea Merge remote-tracking branch 'origin/uat-temp-xw-202501200000-44905' into dev jason 2025-02-26 18:13:48 +0800
  • 713ba026e6 修改cocopit发运逻辑 jason 2025-02-26 18:12:12 +0800
  • 67fd0b8a14 修改配置文件 改成 docker 王杰 2025-02-26 14:36:26 +0800
  • e1bccabd27 修改pom版本 mes 王杰 2025-02-26 13:43:23 +0800
  • 8d60ce28e4 Merge remote-tracking branch 'origin/uat-temp-castle-250213-45097' into test 王杰 2025-02-26 13:42:25 +0800
  • 12f0aabdce Merge remote-tracking branch 'origin/uat-temp-xw-202501200000-44905' into test 王杰 2025-02-26 13:25:16 +0800
  • 7655555aa5 升级dev mes核心包版本为1.0.2-yfai 王杰 2025-02-26 13:05:23 +0800
  • dd840e6751 Merge branch 'uat-temp-xw-202501200000-44905' into dev xiangwei.zhang 2025-02-25 09:26:42 +0800
  • e069468f3c 44905 MES-发运异常处理 xiangwei.zhang 2025-02-25 09:24:59 +0800
  • 1b1a559e4d 排序推单 王杰 2025-02-22 11:55:12 +0800
  • 3de53d476a Merge remote-tracking branch 'origin/uat-temp-castle-2502071033-kitting' into test yfai-mes-ext-v3.11 王杰 2025-02-21 10:12:06 +0800
  • 8c98d36b16 kitting 修复调整 臧学普 2025-02-21 09:39:10 +0800
  • 094d9481f8 Merge branch 'test-temp-wj-250117-pack' into dev 王杰 2025-02-20 20:49:45 +0800
  • 690d072318 打包 test-temp-wj-250117-pack 王杰 2025-02-20 20:49:29 +0800
  • 0200f6a308 排序推单主数据配置 王杰 2025-02-20 20:47:42 +0800
  • 3fbb66ee3a Merge branch 'uat-temp-xw-202501200000-44905' into dev xiangwei.zhang 2025-02-20 20:17:37 +0800
  • d899f40f0e 44905 MES-发运异常处理 xiangwei.zhang 2025-02-20 20:15:18 +0800
  • f41716f70a Merge remote-tracking branch 'origin/uat-temp-nht-2502060000-44953' into test yfai-mes-ext-v3.1 王杰 2025-02-20 19:47:34 +0800
  • 1a0417b732 Merge branch 'uat-temp-xw-202501200000-44905' into dev xiangwei.zhang 2025-02-20 18:47:56 +0800
  • 76edb1a497 44905 MES-发运异常处理 xiangwei.zhang 2025-02-20 18:47:19 +0800
  • 2ee77bb608 重庆推单 王杰 2025-02-20 17:41:58 +0800
  • 5beca74961 Merge remote-tracking branch 'origin/uat-temp-xw-202501200000-44905' into dev jason 2025-02-20 17:34:13 +0800
  • f29bef72a0 新增cockpit发运处理功能 jason 2025-02-20 17:33:03 +0800
  • edfd543750 Merge remote-tracking branch 'origin/dev-temp-xw-202502170000-45112' into test 王杰 2025-02-20 11:22:08 +0800
  • 2fb87fcfe8 Merge remote-tracking branch 'origin/dev_temp_xw_202502120000_45071' into test 王杰 2025-02-20 11:18:21 +0800
  • 078f86e8d3 新增cockpit发运处理功能 jason 2025-02-19 17:12:55 +0800
  • 069026f093 Merge branch 'uat-temp-castle-2502071033-kitting' into dev 臧学普 2025-02-19 17:02:12 +0800
  • 4a84cba207 kitting 修复 臧学普 2025-02-19 17:01:42 +0800