Commit Graph

1563 Commits (dev)
 

Author SHA1 Message Date
王杰 d152a464ca 打包 4 months ago
xiangwei.zhang 08301bc9a2 44905 MES-发运异常处理 4 months ago
xiangwei.zhang e834732d74 44838 MES:裁片补片逻辑更新&裁片报表 4 months ago
王杰 ec7f396e33 重庆打包 4 months ago
xiangwei.zhang 45c7fe23da Merge branch 'dev-temp-ljs-202501091824-44656' into dev 4 months ago
王杰 bf114910e2 Merge branch 'uat-temp-wj-2501090000-44517' into test 4 months ago
王杰 585a8edc62 Merge remote-tracking branch 'origin/uat-temp-castle-2501101619-44817' into test 4 months ago
王杰 1c33dce687 Merge remote-tracking branch 'origin/dev-temp-xw-202501130000-44813' into test 4 months ago
xiangwei.zhang a1b3d04f30 Merge branch 'dev-temp-xw-202501150000-44838' into dev 4 months ago
xiangwei.zhang f6b3a36560 44838 MES:裁片补片逻辑更新&裁片报表 4 months ago
xiangwei.zhang 973ff08b91 Merge branch 'dev-temp-xw-202501150000-44838' into dev 4 months ago
xiangwei.zhang 338dd627ca 44838 MES:裁片补片逻辑更新&裁片报表 4 months ago
xiangwei.zhang 1815794e04 Merge branch 'dev-temp-xw-202501150000-44838' into dev 4 months ago
xiangwei.zhang 6e756d0065 44813 PC: 缺陷类型与零件类型关系导入后,没有关联显示出来缺陷类型名称和零件类型名称 4 months ago
xiangwei.zhang 10131f750e 44838 MES:裁片补片逻辑更新&裁片报表 4 months ago
王杰 082acc3901 merge origin/uat-temp-castle-2412301457-44643 解决冲突 4 months ago
王杰 87f42674da Merge remote-tracking branch 'origin/dev-temp-xw-202501090000-44270' into test 4 months ago
王杰 132f7d53d7 Merge branch 'uat-temp-wj-2501090000-44746' into test 4 months ago
王杰 f3dd964e48 Merge remote-tracking branch 'origin/dev-temp-xw-202501071939-44728' into test 4 months ago
王杰 d7e9810924 Merge remote-tracking branch 'origin/dev-temp-xw-202501151600-44670' into test 4 months ago
王杰 8e29e74429 merge dev-temp-ljs-202501091824-44656 解决冲突 4 months ago
xiangwei.zhang d8fcc8abfd 44670 PC: 模板导入时报错问题 4 months ago
xiangwei.zhang 471967fd7e 44756 版本回退 4 months ago
王杰 3c152132ca Merge remote-tracking branch 'origin/uat-temp-castle-2501090952-44747' into test 4 months ago
王杰 663f430d23 Merge branch 'dev-temp-xw-202412301219-44255' into test 4 months ago
王杰 5faa656bd2 Merge branch 'dev-temp-xw-202412301219-44255' into test 4 months ago
王杰 4f5f24f84a Merge branch 'uat-temp-wj-2412300000-44653' into test 4 months ago
王杰 f1294f551c Merge branch 'uat-temp-wj-2412300000-44615' into test 4 months ago
jun cf77b07eda Merge remote-tracking branch 'origin/dev' into dev 4 months ago
jun e42cdd4f76 44656 报工调整报表中原因为空 测试问题修复 4 months ago
xiangwei.zhang 06cb051548 Merge branch 'dev-temp-xw-202412301219-44255' into dev 4 months ago
xiangwei.zhang 620ae11ebd 44255-优化:非排序工艺路线支持所有路线主表明细批量导入 4 months ago
xiangwei.zhang 732d8acea6 Merge branch 'dev-temp-xw-202501090000-44270' into dev 4 months ago
xiangwei.zhang 6d160bfc2e Merge remote-tracking branch 'origin/dev' into dev 4 months ago
xiangwei.zhang a16cf1e759 Merge branch 'dev-temp-xw-202501130000-44813' into dev 4 months ago
xiangwei.zhang 6ff07cd721 44813 PC: 缺陷类型与零件类型关系导入后,没有关联显示出来缺陷类型名称和零件类型名称 4 months ago
xiangwei.zhang ce6e53fd72 44270 PC:非排序产品加工规则的批量导入 4 months ago
jun f08ab29045 44656 报工调整报表中原因为空 提示信息错误 4 months ago
王杰 d283381dd5 Merge branch 'uat-temp-wj-2501090000-44517' into dev 4 months ago
王杰 d4725e67c2 44517 装箱防错后吐条码需求(芜湖) 4 months ago
王杰 d953cb8202 Merge branch 'uat-temp-wj-2501090000-44746' into dev 4 months ago
王杰 29026a1051 44746 产量统计报表增加报工调整数据查询 4 months ago
王杰 bb794935c9 Merge branch 'uat-temp-wj-2501090000-44746' into dev 4 months ago
王杰 c0b76c9800 44746 产量统计报表增加报工调整数据查询 4 months ago
王杰 10315bedcf Merge branch 'uat-temp-wj-2501090000-44746' into dev 4 months ago
王杰 99386ba5a0 44746 产量统计报表增加报工调整数据查询 4 months ago
王杰 8c6178ffbb Merge branch 'uat-temp-wj-2501090000-44517' into dev 4 months ago
王杰 346a5b6049 Merge remote-tracking branch 'origin/uat-temp-castle-2501101619-44817' into dev 4 months ago
王杰 e9cc89e278 Merge remote-tracking branch 'origin/dev-temp-xw-202501090000-44270' into dev 4 months ago
臧学普 1b61155d64 fix bug 44817 离线生成的装配件数据缺少 4 months ago