Commit Graph

1563 Commits (dev)
 

Author SHA1 Message Date
xiangwei.zhang 3be4afacb7 Merge branch 'dev_temp_xw_202503120000_45631' into dev 2 months ago
xiangwei.zhang 1d346854cc 45631 广州有2套不同生产版本bom导致多报工问题 2 months ago
王杰 832568023d Merge remote-tracking branch 'origin/uat-temp-wj-custpartservice_four' into test 2 months ago
王杰 1dbefd1d8c Merge remote-tracking branch 'origin/uat-temp-xw-202501200000-44905' into test 2 months ago
jason 7d50b24299 Merge remote-tracking branch 'origin/uat-temp-nht-2503040000-seres' into dev 2 months ago
jason 4f20a0d416 Merge remote-tracking branch 'origin/uat-temp-nht-2503110000-45549' into dev 2 months ago
jason 255cb7db32 修复Bug:45549,增加过账日期起始-过账日期截止的 查询条件 2 months ago
jason acb394bb6b 修复赛力斯报表查询问腿 2 months ago
jason 626f1efd0d 修复赛力斯报表查询问腿 2 months ago
王杰 acf5e70b5d Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 2 months ago
王杰 5bba6ba515 Merge branch 'uat-temp-wj-custpartservice_four' into dev 2 months ago
王杰 e8de99d38f 零件发运组明细 新增 查询客户物料号 回车无数据问题临时处理(热部署云正式) 最终合并版本 2 months ago
jason fe6ba8e8cf 新增看板 2 months ago
xiangwei.zhang 85280e5c98 Merge branch 'dev_temp_xw_20250305_45455' into dev 2 months ago
xiangwei.zhang 66f4b12999 45455 裁片生产过程控制,产品加工记录数量保存数据不对 2 months ago
jason 6f292e8842 新增看板 2 months ago
xiangwei.zhang 9a432311e3 45455 裁片生产过程控制,产品加工记录数量保存数据不对 2 months ago
xiangwei.zhang c5e1bf8cbc Merge remote-tracking branch 'origin/dev' into dev 2 months ago
xiangwei.zhang 3d02c9b4a9 Merge branch 'dev_temp_xw_20250305_45455' into dev 2 months ago
xiangwei.zhang 4af1337a7f 45455 裁片生产过程控制,产品加工记录数量保存数据不对 2 months ago
xiangwei.zhang ec571d1bbc 45455 裁片生产过程控制,产品加工记录数量保存数据不对 2 months ago
xiangwei.zhang 72e51a2bf1 45455 裁片生产过程控制,产品加工记录数量保存数据不对 2 months ago
王杰 c307a62832 重庆大区代码合并 解决冲突 2 months ago
jason 05209424ce Merge remote-tracking branch 'origin/uat-temp-xw-202501200000-44905' into dev 2 months ago
jason bc8cc74021 增加发运单异常处理同步发运零件号及条码卡控 2 months ago
王杰 f389b546d6 Merge branch 'test-temp-wj-interface-mapper' into dev 2 months ago
王杰 1a377bb99e Merge branch 'test' into test-temp-wj-interface-mapper 2 months ago
王杰 af7cf44328 Merge remote-tracking branch 'origin/uat-temp-xw-202501200000-44905' into test 2 months ago
王杰 c55224a658 接口映射 增加 4,5,6 数据源 2 months ago
jason 7bf43e5eea Merge remote-tracking branch 'origin/uat-temp-xw-202501200000-44905' into dev 2 months ago
jason 713ba026e6 修改cocopit发运逻辑 2 months ago
王杰 67fd0b8a14 修改配置文件 改成 docker 2 months ago
王杰 e1bccabd27 修改pom版本 mes 2 months ago
王杰 8d60ce28e4 Merge remote-tracking branch 'origin/uat-temp-castle-250213-45097' into test 2 months ago
王杰 12f0aabdce Merge remote-tracking branch 'origin/uat-temp-xw-202501200000-44905' into test 2 months ago
王杰 7655555aa5 升级dev mes核心包版本为1.0.2-yfai 2 months ago
xiangwei.zhang dd840e6751 Merge branch 'uat-temp-xw-202501200000-44905' into dev 2 months ago
xiangwei.zhang e069468f3c 44905 MES-发运异常处理 2 months ago
王杰 1b1a559e4d 排序推单 3 months ago
王杰 3de53d476a Merge remote-tracking branch 'origin/uat-temp-castle-2502071033-kitting' into test 3 months ago
臧学普 8c98d36b16 kitting 修复调整 3 months ago
王杰 094d9481f8 Merge branch 'test-temp-wj-250117-pack' into dev 3 months ago
王杰 690d072318 打包 3 months ago
王杰 0200f6a308 排序推单主数据配置 3 months ago
xiangwei.zhang 3fbb66ee3a Merge branch 'uat-temp-xw-202501200000-44905' into dev 3 months ago
xiangwei.zhang d899f40f0e 44905 MES-发运异常处理 3 months ago
王杰 f41716f70a Merge remote-tracking branch 'origin/uat-temp-nht-2502060000-44953' into test 3 months ago
xiangwei.zhang 1a0417b732 Merge branch 'uat-temp-xw-202501200000-44905' into dev 3 months ago
xiangwei.zhang 76edb1a497 44905 MES-发运异常处理 3 months ago
王杰 2ee77bb608 重庆推单 3 months ago